summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Added player death and event schedulingKelly Rauchenberger2018-02-1817-20/+348
| | | | Also added ability to make sprites flicker, to freeze physics for an entity, and to freeze progression of a sprite's animation loop.
* Implemented map adjacencyKelly Rauchenberger2018-02-1815-160/+717
| | | | | | This brings along with it the ability to move to different maps, for which the PlayingSystem and PlayableComponent were introduced. The PlayingSystem is a general overseer system that handles big picture stuff like initializing the player and changing maps. The PlayableComponent represents the player. While the ControllableComponent is also likely to always only be on the player entity, the two are distinct by separation of concerns. This also required a refactoring of how collisions are processed, because of a bug where the player can move to a new map when horizontal collisions are checked, and vertical collisions are skipped, causing the player to clip through the ground because the normal force was never handled.
* Refactored rendererKelly Rauchenberger2018-02-1627-951/+1631
| | | | | | Renderer is basically now more C++'y, as it makes more use of classes (a lot of GL types have been wrapped), and the renderer itself is now a class. The monitor mesh is also now indexed. Tweaked the NTSC artifacting after inadvertently fixing a bug with the way the image was loaded.
* Fixed inconsistent rendering failureKelly Rauchenberger2018-02-139-42/+54
| | | | | | | | | | The issue appears to have been caused by blending with unset alpha channels. Also included the re-ordered player character sprite image. The CMake file has been updated to include linking against some Apple libraries that are usually already included in GLFW3. refs #1
* Merge branch 'master' into es-rewriteKelly Rauchenberger2018-02-124-76/+17
|\
| * Modernized CMake filesKelly Rauchenberger2018-02-083-76/+17
| | | | | | | | Also removed an unnecessary cmake package helper.
| * Fixed error opening map editor on macOSKelly Rauchenberger2018-02-081-0/+1
| |
* | Abstracted behavior related to "orientable" entitiesKelly Rauchenberger2018-02-1212-207/+393
| | | | | | | | | | | | | | | | A lot of the stuff that ControllingSystem did to control the player character was moved into the new OrientingSystem. This is so that the player, or any player-like entities, can also be controlled by AI, with the underlying behavior being delegated in the same way as if the player were being controlled by the user. Fixed the issue where, if the player were blocked while moving horizontally, they would remain blocked even if vertical movement were to remove the collision. Fixed cases of the player animating incorrectly after performing certain movements.
* | Implemented map rendering and basic collisionKelly Rauchenberger2018-02-1117-31/+27512
| | | | | | | | Only wall and platform collision currently works, and map edges are not currently implemented.
* | Moved sprite rendering into AnimatingSystemKelly Rauchenberger2018-02-088-68/+96
| | | | | | | | Refactored how systems work slightly. Now, rendering can be done by a number of systems working together. Since the AnimatingSystem handles the animation of sprites, it should also handle the rendering of them. Because of this, the RenderingSystem has been removed.
* | Introduced animated spritesKelly Rauchenberger2018-02-0818-183/+521
| | | | | | | | Also restyled a lot of the code.
* | Fixed behavior of letting go of the right buttonKelly Rauchenberger2018-02-071-1/+1
| |
* | Inlined some componentsKelly Rauchenberger2018-02-079-238/+210
| |
* | Merge branch 'master' into es-rewriteKelly Rauchenberger2018-02-075-14/+23
|\|
| * Made some fixes to rendering I guessKelly Rauchenberger2018-02-044-14/+16
| | | | | | | | | | This is pretty old so I'm not exactly sure what it does but without it, the monitor gets rendered upside down.
| * Updated CMakeLists.txtKelly Rauchenberger2018-02-041-0/+6
| |
* | Changed EntityManager to dense vectorKelly Rauchenberger2018-02-075-124/+184
| | | | | | | | | | | | | | | | This should improve speed, because entity lookup will be O(1) instead of O(log n). Deletion is also O(1). Insert stays at potentially O(n), but still should be overall faster than the previous method. Also replaced some asserts with exceptions. Also made Component polymorphic so that deletion actually works properly.
* | Whitespace changesKelly Rauchenberger2018-02-0519-194/+194
| |
* | Removed bare pointer from Sound classKelly Rauchenberger2018-02-051-29/+32
| | | | | | | | Also whitespace changes.
* | Merge branch 'master' of http://github.com/hatkirby/therapy into es-rewriteKelly Rauchenberger2015-12-171-4/+7
|\|
| * Updated CMakeLists.txt so that it can find GLFW3 with pkg-config`Kelly Rauchenberger2015-12-171-4/+7
| |
* | Player now movesKelly Rauchenberger2015-06-2623-61/+642
| |
* | Now displaying player characterKelly Rauchenberger2015-06-1812-152/+270
| |
* | Wrote EntityManagerKelly Rauchenberger2015-06-1132-1994/+294
|/
* Redesigned the moving platform spriteKelly Rauchenberger2015-03-205-1/+1
|
* Fixed bug allowing player to jump through walls when crossing a vertical map ↵Kelly Rauchenberger2015-03-191-5/+5
| | | | | | boundary It turns out that it is somewhat confusing that GAME_HEIGHT != MAP_HEIGHT*TILE_HEIGHT
* Implemented a simple AIKelly Rauchenberger2015-03-1914-102/+436
|
* Map editor can now edit properties for objects (breaks main game build)Kelly Rauchenberger2015-03-1914-145/+716
|
* Wrote an XML Schema describing maps file and also changed the spec a bitKelly Rauchenberger2015-03-1815-772/+620
|
* Game can now read map file from map editor (also added new map)Kelly Rauchenberger2015-03-1813-172/+421
|
* Map editor stops highlighting cursor when you scroll off editable map areaKelly Rauchenberger2015-03-182-0/+23
|
* Added ghosts of adjacent warp maps to map editor widgetKelly Rauchenberger2015-03-183-18/+72
|
* Map editor widget now starts out centeredKelly Rauchenberger2015-03-183-7/+12
|
* Map editor can now define actions to occur when the player goes off a ↵Kelly Rauchenberger2015-03-1716-158/+804
| | | | specified edge of the map
* Fixed bug with starting position label going under the adjacent button in ↵Kelly Rauchenberger2015-03-172-2/+5
| | | | map editor
* Fixed bug with placing entities in map editorKelly Rauchenberger2015-03-172-13/+13
|
* Splitters in map editor now move as dragged and start at reasonable sizesKelly Rauchenberger2015-03-172-14/+32
|
* Made some nice changes to the map editor widgetKelly Rauchenberger2015-03-1710-182/+127
| | | | | | | Center the map edit widget Map edit zooming in should happen around the cursor Disallow editing outside the mapedit widget Add some scroll space around the mapedit widget
* Map editor now assumes a reasonable amount of screen real estateKelly Rauchenberger2015-03-171-3/+27
|
* Implemented undo/redo framework in map editorKelly Rauchenberger2015-03-1710-47/+482
|
* Added tool to map editor to set game starting positionKelly Rauchenberger2015-03-169-87/+251
|
* Opening a file in the map editor closes the current window if the current ↵Kelly Rauchenberger2015-03-164-3/+22
| | | | window is a blank slate
* Added popup menu to tree in map editorKelly Rauchenberger2015-03-162-0/+15
|
* Map editor now remembers last map you looked atKelly Rauchenberger2015-03-163-0/+7
|
* Rewrote map editor so a single file contains all mapsKelly Rauchenberger2015-03-1614-255/+957
| | | | Maps are viewed in a tree control on the left. They can be dragged and dropped. Maps are bolded when they are dirty. Saving saves expansion status and order of maps in tree.
* Added toolbar with file buttons to map editorKelly Rauchenberger2015-03-168-19/+59
|
* Removed "../" from file pathsKelly Rauchenberger2015-03-168-19/+19
|
* Added ability to edit and remove entities to map editorKelly Rauchenberger2015-03-168-19/+126
|
* Adjusted how resizing the map editor worksKelly Rauchenberger2015-03-162-2/+14
| | | | Also added an informative label for the entity manager that currently lies
* Map editor can now add entities to mapsKelly Rauchenberger2015-03-158-45/+260
| | | | Also fixed a big bug regarding scrolling
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-25 15:52:34 +0000