Skip to content

Conversation

@kkafar
Copy link
Collaborator

@kkafar kkafar commented Apr 24, 2022

Description

Checklist

  • Included code to test these changes
  • Updated Jira

mhawryluk and others added 7 commits April 24, 2022 14:24
* feat: Add showing points popup on key press (F)

* refactor: Create PopupController

- class responsible for creating and controlling popups, currently only handles PointsEarnedPopup

* Apply suggestions from code review

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
* chore: allow for creation of different object types

* refact: newline at object-1 file end

* chore: add JavaDoc comments for MouseClickedEvent

* chore: add JavaDoc comments for KeyboardEvent

* chore: add JavaDoc comments for GameObjectStateChange

* chore: add JavaDocs comments for LocationModelStateChange

* chore: style update

* chore: make Initializer#mainStage field final

mainStage is coming as a constructor parameter and it is entry stage
provided by JavaFX. We do not change, and we do not want to change this
reference anywhere.

* chore: remove INTERACTIVE from GameObject.Type enum options

We do not intent to instantiate abstract InteractiveGameObject type.
Only more specific types should be instantiated.

* refact: move GameObject construction to separate factory class & methods

* chore: add GameObjectViewFactory class & methods

This aims to extract the object creation logic from LocationView class

* chore: add builder for LocationModel

This aims to extract the creation logic to separate class to make object
injection possible. (Object injection is needed as we need register view
    to model)

* fix: LocationModel builder methods

* chore: add non null assertion in LocationModel.Builder#setTag method

* chore: register GameObjectViews to their model classses!

* fix: convert game object type string to uppercase in factory method

* fix: remove "interactive" type from configuration types

* chore: update before merging (#19)
* chore: Massive update...

* BREAKING CHANGES: Arch proposal

* chore: rename io.rpg.torefract -> io.rpg.torefact

* refact: rename PointsPopupController -> PointsPopupViewModel

* refact: add comments & change method names in ConfigLoader

* refact: add comments tgo GameObjectConfig

* refact: add comments to GameWorldConfig

* chore: make ConfigLoader#{loadGameWorldConfig,loadLocationConfig}
methods private

* chore: add generic class describing operation result

* chore: add Optional returning getters to Result

* fix: revert changes from #de086eb

Unit tests require these methods -> they must stay being visible inside
a package

* chore: update configuration files

* chore: improve error handlign in config module via Result class

* feat: add helper methods to Result class

isOkValueNull, isErrorValueNull

* chore: add builder to the Game class

* refact: adapt Main to new Result based interface

* feat: add builder to the Controller

* chore: update unit test configuration

* fix: make unit tests pass

* chore: Update observer schema before refractoring

* docs: add more comments to GameWorldConfig

* chore: make GameObjectConfig#valide method return Result

* chore: Cleanup ConfigLoader

* chore: minor fixes & apply linter

* refact: apply style suggestions

* chore: attempt to display game objects on screen

* chore: displaying objects on screen v1

* chore: displaying objects on screen v2

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
* feat: click to interact

* Handling clicking on interactable objects

* handling mouse clicks on interactive objects

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
@kkafar
Copy link
Collaborator Author

kkafar commented Apr 25, 2022

@co012 Ciągle czekamy na #22 oraz poruszanie graczem (jeszcze nie ma PR'a)

@kkafar kkafar marked this pull request as draft April 25, 2022 13:49
Copy link
Collaborator

@zamojtel zamojtel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved

Monatyr and others added 3 commits April 26, 2022 00:26
* feat: click to interact

* Handling clicking on interactable objects

* handling mouse clicks on interactive objects

* fix: coordinates of mouse click to object position on map

* Update src/main/java/io/rpg/controller/Controller.java

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>

Co-authored-by: Kacper Kafara <kacperkafara@gmail.com>
* chore: Design location for demo 1.0

* feat: Open pointsPopup when CollectibleGameObject is selected
* done movement

* feat: Made player movement work. Desperately needs refactoring.

Co-authored-by: Zamojtel Bartek <zamojtelbartek@gmail.com>
Co-authored-by: mhawryluk <marcinhawrylukxx@gmail.com>
@kkafar kkafar marked this pull request as ready for review April 26, 2022 08:29
@kkafar kkafar changed the title feat: merge dev branch chore: adapt old code base to new architecture Apr 26, 2022
@kkafar kkafar merged commit 12d68f7 into master Apr 28, 2022
@mhawryluk mhawryluk deleted the development branch April 30, 2022 22:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants