Commit Graph

83 Commits

Author SHA1 Message Date
Martin Araneda 2be22ceb68 Merge branch 'develop' into feature/Coin
# Conflicts:
#	godot/Main.tscn
2022-08-01 14:17:05 -04:00
Martin Araneda b24c9e8732 fix goal state 2022-08-01 14:10:00 -04:00
Chris Cromer f8f1210e61
Merge branch 'develop' into feature/enemies
# Conflicts:
#	godot/characters/player/Player.tscn
2022-07-27 00:08:25 -04:00
Chris Cromer 18a7cac068
change dot vector check to be greater than 0 2022-07-27 00:03:59 -04:00
Chris Cromer 8cfa1d5cce
add sounds and adjust music 2022-07-26 23:14:21 -04:00
Chris Cromer d35993d072
add comment to _on_player_touched 2022-07-21 20:54:06 -04:00
Chris Cromer 948f4ce911
add some enemy behavior prototypes 2022-07-21 00:05:08 -04:00
Chris Cromer e4b91d2739 pause game when starting 2022-07-19 21:44:28 -04:00
Chris Cromer 9f3e78fa94 Get monitor working and communicating with backend 2022-07-19 21:44:28 -04:00
Martin Araneda d14cc627de Flag successfully placed on lvl, hitbox detected and working 2022-07-17 21:51:11 -04:00
Martin Araneda b9ff12dab3 Finished coin counter 2022-07-16 18:36:38 -04:00
Martin Araneda b25e1f040c minor changes 2022-07-15 23:04:06 -04:00
Chris Cromer 26cb0fb86f
update tiled importer and fix camera bounds to work with it 2022-07-06 18:03:25 -04:00
Martin Araneda 3a58777773 coin counter method created 2022-06-25 20:54:47 -04:00
Martin Araneda a439748a34 On-screen coin counter state machine archives added 2022-06-21 23:26:43 -04:00
Martin Araneda 876206c39d Added two states, collected and not collected 2022-06-11 00:26:11 -04:00
Martin Araneda 5fe9e3340a Some fixes on Coin files 2022-06-06 20:59:51 -04:00
Martin Araneda 20e2fafcf4 Coin state machines archives created but not functional 2022-05-24 23:17:16 -04:00
Chris Cromer 4a2cda5ecd
update comments 2022-04-22 21:56:22 -04:00
Chris Cromer 8b251776a0
fix header path 2022-04-22 21:45:46 -04:00
Chris Cromer e5c4e54fe4
add missing CameraLimit class comment 2022-04-22 14:13:39 -04:00
Chris Cromer 8edcae5adc
add camera limit script 2022-04-20 11:48:11 -04:00
Chris Cromer 97d84ef36a make level dynamic from main 2022-04-16 20:05:32 -04:00
Chris Cromer db51a218ec improve error messages and checking 2022-04-16 20:05:32 -04:00
Chris Cromer 1c24ba0cd1
add documentation 2022-04-13 00:59:23 -04:00
Chris Cromer 219b277e5c
some cleanup of the code 2022-04-12 11:33:22 -04:00
Chris Cromer ecd6fe45b2
add state machine and have player use it 2022-04-11 13:30:51 -04:00
Chris Cromer 6d2d1178a7
remove include directory 2022-04-10 09:43:33 -04:00
Chris Cromer 8f76f9a2c9
move player code 2022-04-09 22:20:02 -04:00
Chris Cromer ac86f148ba
merge develop 2022-04-09 22:16:27 -04:00
Chris Cromer 756b42bf82
change the game name 2022-04-09 21:50:08 -04:00
Chris Cromer fac339926b
change speed back to 60.0 2022-04-06 22:46:31 -04:00
Chris Cromer a2ad48e900
prototype 2022-04-05 14:51:59 -04:00