summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Map editor can now save and load (but not edit) entities in mapsKelly Rauchenberger2015-03-156-7/+227
|
* Fixed the empty XML bug AGAINKelly Rauchenberger2015-03-151-12/+18
|
* Fixed error with empty left and right mapsKelly Rauchenberger2015-03-153-23/+22
|
* Fixed functionality of quit menu item in map editorKelly Rauchenberger2015-03-153-10/+41
|
* Added ability to edit title in map editorKelly Rauchenberger2015-03-156-25/+50
|
* Added file management to map editor (only edits environment at current time)Kelly Rauchenberger2015-03-155-16/+204
|
* Fixed bug with map with no nameKelly Rauchenberger2015-03-151-2/+8
|
* Added preview of tile to be placed under mouse in map editorKelly Rauchenberger2015-03-152-0/+29
|
* Added scrolling and zooming to map editorKelly Rauchenberger2015-03-157-50/+131
|
* Added basic ability to set tiles in map editorKelly Rauchenberger2015-03-158-33/+298
|
* Started writing map editorKelly Rauchenberger2015-03-148-7/+244
|
* Added sound when you hit the groundKelly Rauchenberger2015-03-1424-768/+844
| | | | Also split up components.cpp into files for each class, fixed a bug concerning falling off the screen when you change maps, and converted collision data into doubles.
* Removed some unnecessary parameters from methodsKelly Rauchenberger2015-03-146-15/+18
|