nutomic/dungeon-gunner
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
162 commits 1 branch 0 tags 824 KiB
Commit graph

156 commits

Author SHA1 Message Date
Felix Ableitner
7ebf912aad Fixed wrong order initialization. 2013-04-04 21:50:52 +02:00
Felix Ableitner
3d9ab86e72 Added nullpointer check, removed mistakenly added file. 2013-04-04 21:49:38 +02:00
Felix Ableitner
5ddc6c6c97 Merge branch 'temp' 2013-03-31 15:34:23 +02:00
Felix Ableitner
602a6a5e66 Added explicit keyword to all constructors. 2013-03-30 16:39:46 +01:00
Felix Ableitner
12441076c0 Improved error handling and fallbacks. 2013-03-30 13:38:25 +01:00
Felix Ableitner
0c29dac282 Removed player right click movement. 2013-03-30 02:38:16 +01:00
Felix Ableitner
a083708850 Made direction param optional in Sprite::Data. 2013-03-30 02:36:06 +01:00
Felix Ableitner
47d9882e77 Changed code to use direction vector instead of angle. 2013-03-30 02:30:11 +01:00
Felix Ableitner
8e65b94667 Added function to get nearby characters. 2013-03-29 18:48:49 +01:00
Felix Ableitner
7c55643da4 Removed unneeded variable. 2013-03-29 18:42:56 +01:00
Felix Ableitner
a3f6b827bd Removed unneeded includes in .cpp files. 2013-03-29 18:41:42 +01:00
Felix Ableitner
995895872e Removed unneeded Timer class. 2013-03-29 18:35:32 +01:00
Felix Ableitner
6e631e78d5 Cleaned includes in .h files. 2013-03-29 18:34:51 +01:00
Felix Ableitner
30de9e397b Moved Character handling to world, improved some includes. 2013-03-29 17:59:35 +01:00
Felix Ableitner
7a074b7c3d Replaced diameter with radius. 2013-03-27 16:09:01 +01:00
Felix Ableitner
98e2836c14 Improved portal traversal. 2013-03-27 16:06:57 +01:00
Felix Ableitner
6641823cd1 Added path finding. 2013-03-27 14:38:34 +01:00
Felix Ableitner
3dace753f2 Fixed map generation. 2013-03-27 14:37:32 +01:00
Felix Ableitner
eb2bcf1d6d Shortened and improved path following code. 2013-03-25 16:58:13 +01:00
Felix Ableitner
ff65f6ceb6 Added Sprite::getRadius(). 2013-03-19 20:51:56 +01:00
Felix Ableitner
1dfd878a20 Removed Pathfinder class. 2013-03-19 20:43:27 +01:00
Felix Ableitner
394ebc04c7 Improved onThink function structure. 2013-03-09 17:33:58 +01:00
Felix Ableitner
3d74314d22 Fixed rect-circle collisions not working on rect corners. 2013-03-05 00:36:22 +01:00
Felix Ableitner
3ea80fa5ed Moved World::checkDelete into World::step, made checks debug only. 2013-03-03 22:02:53 +01:00
Felix Ableitner
12655e0319 Moved corpse dropping to Character::onDeath to allow overloading. 2013-03-03 21:33:01 +01:00
Felix Ableitner
310816eba6 Added collisions detection. 2013-03-03 21:32:49 +01:00
Felix Ableitner
9fd43d1d3a Fixed bullet collisions. 2013-03-03 21:28:12 +01:00
Felix Ableitner
f51b8a1aaa Fixed masking. 2013-03-03 21:27:40 +01:00
Felix Ableitner
637ea180c3 Replaced setTile with insertTile and removeTile. 2013-03-03 21:26:29 +01:00
Felix Ableitner
f0a9c3320d Added automatic weapons. 2012-12-24 01:14:22 +01:00
Felix Ableitner
5433e14f51 Moved weapon file name from code to YAML. 2012-12-24 00:49:49 +01:00
Felix Ableitner
b6002eb6fd Removed needless function. 2012-12-23 15:52:38 +01:00
Felix Ableitner
f384165e24 Merged Sprite and Body. 2012-12-23 15:50:49 +01:00
Felix Ableitner
88270ad28c Removed redundant parameter. 2012-12-22 16:52:43 +01:00
Felix Ableitner
e6b6bc58fc Re-implemented movement. 2012-12-22 16:52:29 +01:00
Felix Ableitner
21040de4dc Fixed weapon firing direction. 2012-12-22 16:44:07 +01:00
Felix Ableitner
0eee81d574 Removed unused constructor. 2012-12-22 15:13:28 +01:00
Felix Ableitner
7c4eb47f2e Removed string/vector typedefs. 2012-12-22 15:10:26 +01:00
Felix Ableitner
a157f0857d Merged Collection into World. 2012-12-22 14:56:17 +01:00
Felix Ableitner
f42bdf5a24 Re-implemented Body funcionality (without library). 2012-12-22 13:44:17 +01:00
Felix Ableitner
6c83d3827a Removed texture path param from Character. 2012-12-22 01:45:52 +01:00
Felix Ableitner
402cd138d3 Removed Instances class. 2012-12-22 01:44:36 +01:00
Felix Ableitner
d923e94541 Game: Merged tick() into loop(), removed getFps(). 2012-12-22 01:24:44 +01:00
Felix Ableitner
e20c99b89f Replaced all Box2D funcitonality with dummy behaviour. 2012-12-22 01:14:30 +01:00
Felix Ableitner
fbcbcc6902 Removed all Pathfinder functionality. 2012-12-22 00:56:31 +01:00
Felix Ableitner
99243ccd60 Fixed include guards and comments. 2012-12-22 00:51:42 +01:00
Felix Ableitner
fa5c64d043 Added hardcoded default values for YAML values. 2012-12-20 14:59:05 +01:00
Felix Ableitner
88db5d5324 Renamed Body to Corpse, Physical to Body. 2012-12-20 10:31:32 +01:00
Felix Ableitner
1e0d005a1b Removed Cover class. 2012-11-13 19:58:17 +01:00
Felix Ableitner
27388c7af3 Fixed wrong include guard. 2012-10-21 17:27:24 +02:00
Felix Ableitner
38d97abd5c Added YAML option to limit firing interval of weapons. 2012-10-19 15:44:45 +02:00
Felix Ableitner
fe7909ea7b Changed Yaml to log missing files, files are actually closed. 2012-10-19 15:14:25 +02:00
Felix Ableitner
bb3ecf637b Changed folder structure, moved files. 2012-10-14 18:14:06 +02:00
Felix Ableitner
2be3f13810 Moved path finding logic from Player to Character. 2012-10-13 19:36:33 +02:00
Felix Ableitner
f0753b4a3a Updated documentation. 2012-10-13 19:28:46 +02:00
Felix Ableitner
c1c461f8e2 Moved Weapon from Player to Character. 2012-10-13 18:58:15 +02:00
Felix Ableitner
5517db89c7 Moved movent speed to Character (loaded from yaml). 2012-10-13 18:50:28 +02:00
Felix Ableitner
11da25ce69 Minor code changes. 
Moved template function definitions out of class definitions.
Moved Instances to util/.
 2012-10-13 13:13:19 +02:00
Felix Ableitner
99da2acd01 Allowed Sprite size to be optionally set in code (for Cover). 2012-10-13 12:54:09 +02:00
Felix Ableitner
516633a374 Removed secondary Sprite constructor (now only via Yaml). 2012-10-13 12:48:16 +02:00
Felix Ableitner
9b61304d1e Changed Physical size to be passed via Yaml. 2012-10-13 12:38:05 +02:00
Felix Ableitner
daaf8c8d9a Added stream output operator for Vector2i. 2012-10-13 12:02:04 +02:00
Felix Ableitner
d7013ce63a Added Yaml config to Sprite (for texture file). 2012-10-12 20:59:33 +02:00
Felix Ableitner
c93a6b0c9e Added Yaml config to all Sprite subclasses (except tiles). 2012-10-12 20:50:24 +02:00
Felix Ableitner
f23f2225db Added Yaml config for bullet. 2012-10-12 19:22:53 +02:00
Felix Ableitner
28681c7eb3 Allow setting weapon damage via yaml config. 2012-10-12 19:04:34 +02:00
Felix Ableitner
76b074220d Added Yaml class for runtime configuration 2012-10-12 19:04:03 +02:00
Felix Ableitner
9ff5edbcd5 Added String typedef to std::string for easier changing. 2012-10-11 23:28:54 +02:00
Felix Ableitner
4981af6438 Added empty default implementation for Character::onThink. 2012-10-04 19:36:05 +02:00
Felix Ableitner
afdd8a03b1 Character: Moved setDelete from onDeath to onDamage. 
This means the default implemenation does not need to be called
by implementations.
 2012-10-04 19:30:50 +02:00
Felix Ableitner
f013b3c000 Moved creation of Body from Enemy to Character. 2012-10-04 19:24:46 +02:00
Felix Ableitner
cdeac690f2 Added Instances class to pass major objects in c'tors. 2012-10-04 19:10:12 +02:00
Felix Ableitner
f4bb9a5dae Made Character a subclass of Sprite. 2012-10-01 11:13:26 +02:00
Felix Ableitner
484bba13c8 Renamed Actor to Character. 2012-10-01 11:02:44 +02:00
Felix Ableitner
a5386c7682 Moved window creation to main(). 2012-10-01 10:47:42 +02:00
Felix Ableitner
178a040f54 Moved all map/world generation to Game::generate(). 2012-10-01 10:15:38 +02:00
Felix Ableitner
8d295df943 Replaced enum with enum class where possible. 2012-10-01 10:01:58 +02:00
Felix Ableitner
197ef6b398 Integrated Pathfinder class into Game/Player. 2012-10-01 09:12:00 +02:00
Felix Ableitner
69889e5edc Added Pathfinder class (with errors). 2012-10-01 09:09:05 +02:00
Felix Ableitner
bf31cadc71 Added getter functions for size, solid and static properties. 2012-09-28 18:43:28 +02:00
Felix Ableitner
9a3f97b990 Added output operator for Vector2f, minor fixes. 2012-09-25 18:20:45 +02:00
Felix Ableitner
77d78b3936 Added comments and clarified headers. 2012-09-16 21:32:31 +02:00
Felix Ableitner
3cc8c93845 Removed Collection::Level, using Physical::Category order instead. 2012-09-16 20:33:00 +02:00
Felix Ableitner
dbfa7c10c2 Resolved conflict (missed earlier). 2012-09-15 15:28:15 +02:00
Felix Ableitner
17e628b083 Added forward declarations (not for library types). 2012-09-14 20:39:56 +02:00
Felix Ableitner
69eca24bd2 Added Body class to be dropped by Enemy on death. 2012-09-14 20:33:32 +02:00
Felix Ableitner
86e7da2303 Changed Player, Enemy and Bullet to use circle for collision model. 2012-09-13 14:35:04 +02:00
Felix Ableitner
2f8e91c3b7 Added option to use circle as collision model. 2012-09-13 14:34:36 +02:00
Felix Ableitner
188fa2907b Fixed angle setters/getters in Physical. 2012-09-13 13:35:16 +02:00
Felix Ableitner
98fb433dbf Added direct movement via WASD keys. 2012-09-13 13:00:50 +02:00
Felix Ableitner
a793cc8933 Merged invalid branch. 2012-09-12 14:21:57 +02:00
Felix Ableitner
c679a0ecaa Bullets are inserted at offset to avoid collisions on insert. 2012-09-11 22:02:46 +02:00
Felix Ableitner
59cd09ac16 Added bullet damage constant. 2012-09-11 21:15:16 +02:00
Felix Ableitner
d1a31cac3e Added comments. 2012-09-11 21:13:36 +02:00
Felix Ableitner
e2a48470e5 Added constant for player size. 2012-09-11 21:12:34 +02:00
Felix Ableitner
09e0a5f2d2 Added documentation. 2012-09-11 19:37:19 +02:00
Felix Ableitner
b782614bc4 Made bullet size a public constant. 2012-09-11 19:20:17 +02:00
Felix Ableitner
6ea371ee2e Pass bullet damage from weapon. 2012-09-11 18:08:08 +02:00
Felix Ableitner
b0d2fe7a1f Added health to actor, bullets can damage and kill. 2012-09-11 18:08:07 +02:00
Felix Ableitner
4419a76dfa Added Enemy class. 2012-09-11 16:22:47 +02:00