Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into es-rewrite | Kelly Rauchenberger | 2018-02-07 | 5 | -14/+23 |
|\ | |||||
| * | Made some fixes to rendering I guess | Kelly Rauchenberger | 2018-02-04 | 4 | -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.txt | Kelly Rauchenberger | 2018-02-04 | 1 | -0/+6 |
| | | |||||
* | | Changed EntityManager to dense vector | Kelly Rauchenberger | 2018-02-07 | 5 | -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 changes | Kelly Rauchenberger | 2018-02-05 | 19 | -194/+194 |
| | | |||||
* | | Removed bare pointer from Sound class | Kelly Rauchenberger | 2018-02-05 | 1 | -29/+32 |
| | | | | | | | | Also whitespace changes. | ||||
* | | Merge branch 'master' of http://github.com/hatkirby/therapy into es-rewrite | Kelly Rauchenberger | 2015-12-17 | 1 | -4/+7 |
|\| | |||||
| * | Updated CMakeLists.txt so that it can find GLFW3 with pkg-config` | Kelly Rauchenberger | 2015-12-17 | 1 | -4/+7 |
| | | |||||
* | | Player now moves | Kelly Rauchenberger | 2015-06-26 | 23 | -61/+642 |
| | | |||||
* | | Now displaying player character | Kelly Rauchenberger | 2015-06-18 | 12 | -152/+270 |
| | | |||||
* | | Wrote EntityManager | Kelly Rauchenberger | 2015-06-11 | 32 | -1994/+294 |
|/ | |||||
* | Redesigned the moving platform sprite | Kelly Rauchenberger | 2015-03-20 | 5 | -1/+1 |
| | |||||
* | Fixed bug allowing player to jump through walls when crossing a vertical map ↵ | Kelly Rauchenberger | 2015-03-19 | 1 | -5/+5 |
| | | | | | | boundary It turns out that it is somewhat confusing that GAME_HEIGHT != MAP_HEIGHT*TILE_HEIGHT | ||||
* | Implemented a simple AI | Kelly Rauchenberger | 2015-03-19 | 14 | -102/+436 |
| | |||||
* | Map editor can now edit properties for objects (breaks main game build) | Kelly Rauchenberger | 2015-03-19 | 14 | -145/+716 |
| | |||||
* | Wrote an XML Schema describing maps file and also changed the spec a bit | Kelly Rauchenberger | 2015-03-18 | 15 | -772/+620 |
| | |||||
* | Game can now read map file from map editor (also added new map) | Kelly Rauchenberger | 2015-03-18 | 13 | -172/+421 |
| | |||||
* | Map editor stops highlighting cursor when you scroll off editable map area | Kelly Rauchenberger | 2015-03-18 | 2 | -0/+23 |
| | |||||
* | Added ghosts of adjacent warp maps to map editor widget | Kelly Rauchenberger | 2015-03-18 | 3 | -18/+72 |
| | |||||
* | Map editor widget now starts out centered | Kelly Rauchenberger | 2015-03-18 | 3 | -7/+12 |
| | |||||
* | Map editor can now define actions to occur when the player goes off a ↵ | Kelly Rauchenberger | 2015-03-17 | 16 | -158/+804 |
| | | | | specified edge of the map | ||||
* | Fixed bug with starting position label going under the adjacent button in ↵ | Kelly Rauchenberger | 2015-03-17 | 2 | -2/+5 |
| | | | | map editor | ||||
* | Fixed bug with placing entities in map editor | Kelly Rauchenberger | 2015-03-17 | 2 | -13/+13 |
| | |||||
* | Splitters in map editor now move as dragged and start at reasonable sizes | Kelly Rauchenberger | 2015-03-17 | 2 | -14/+32 |
| | |||||
* | Made some nice changes to the map editor widget | Kelly Rauchenberger | 2015-03-17 | 10 | -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 estate | Kelly Rauchenberger | 2015-03-17 | 1 | -3/+27 |
| | |||||
* | Implemented undo/redo framework in map editor | Kelly Rauchenberger | 2015-03-17 | 10 | -47/+482 |
| | |||||
* | Added tool to map editor to set game starting position | Kelly Rauchenberger | 2015-03-16 | 9 | -87/+251 |
| | |||||
* | Opening a file in the map editor closes the current window if the current ↵ | Kelly Rauchenberger | 2015-03-16 | 4 | -3/+22 |
| | | | | window is a blank slate | ||||
* | Added popup menu to tree in map editor | Kelly Rauchenberger | 2015-03-16 | 2 | -0/+15 |
| | |||||
* | Map editor now remembers last map you looked at | Kelly Rauchenberger | 2015-03-16 | 3 | -0/+7 |
| | |||||
* | Rewrote map editor so a single file contains all maps | Kelly Rauchenberger | 2015-03-16 | 14 | -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 editor | Kelly Rauchenberger | 2015-03-16 | 8 | -19/+59 |
| | |||||
* | Removed "../" from file paths | Kelly Rauchenberger | 2015-03-16 | 8 | -19/+19 |
| | |||||
* | Added ability to edit and remove entities to map editor | Kelly Rauchenberger | 2015-03-16 | 8 | -19/+126 |
| | |||||
* | Adjusted how resizing the map editor works | Kelly Rauchenberger | 2015-03-16 | 2 | -2/+14 |
| | | | | Also added an informative label for the entity manager that currently lies | ||||
* | Map editor can now add entities to maps | Kelly Rauchenberger | 2015-03-15 | 8 | -45/+260 |
| | | | | Also fixed a big bug regarding scrolling | ||||
* | Map editor can now save and load (but not edit) entities in maps | Kelly Rauchenberger | 2015-03-15 | 6 | -7/+227 |
| | |||||
* | Fixed the empty XML bug AGAIN | Kelly Rauchenberger | 2015-03-15 | 1 | -12/+18 |
| | |||||
* | Fixed error with empty left and right maps | Kelly Rauchenberger | 2015-03-15 | 3 | -23/+22 |
| | |||||
* | Fixed functionality of quit menu item in map editor | Kelly Rauchenberger | 2015-03-15 | 3 | -10/+41 |
| | |||||
* | Added ability to edit title in map editor | Kelly Rauchenberger | 2015-03-15 | 6 | -25/+50 |
| | |||||
* | Added file management to map editor (only edits environment at current time) | Kelly Rauchenberger | 2015-03-15 | 5 | -16/+204 |
| | |||||
* | Fixed bug with map with no name | Kelly Rauchenberger | 2015-03-15 | 1 | -2/+8 |
| | |||||
* | Added preview of tile to be placed under mouse in map editor | Kelly Rauchenberger | 2015-03-15 | 2 | -0/+29 |
| | |||||
* | Added scrolling and zooming to map editor | Kelly Rauchenberger | 2015-03-15 | 7 | -50/+131 |
| | |||||
* | Added basic ability to set tiles in map editor | Kelly Rauchenberger | 2015-03-15 | 8 | -33/+298 |
| | |||||
* | Started writing map editor | Kelly Rauchenberger | 2015-03-14 | 8 | -7/+244 |
| | |||||
* | Added sound when you hit the ground | Kelly Rauchenberger | 2015-03-14 | 24 | -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 methods | Kelly Rauchenberger | 2015-03-14 | 6 | -15/+18 |
| |