Commit Graph

171 Commits

Author SHA1 Message Date
Chris Cromer 0f85d5cfa3
use the Time singleton instead of OS singleton
time functions in OS are being deprecated and will be removed in gotod 4.0
2022-08-05 13:23:45 -04:00
Chris Cromer 7a3b29a419
Merge branch 'develop' into feature/enemies 2022-08-05 12:16:52 -04:00
Chris Cromer 0d0fb42698
add godot-cpp 3.5 submodule 2022-08-05 12:06:45 -04:00
Chris Cromer c3986d34a4
remove godot-cpp submodule 2022-08-05 12:04:22 -04:00
Chris Cromer d0ad886184
remove godot-cpp submodule 2022-08-05 12:03:59 -04:00
Chris Cromer 5ce3a2f37c
add blightwing prototype example 2022-08-04 00:59:48 -04:00
Chris Cromer a72954b578
add blightwing's behavior 2022-08-04 00:59:10 -04:00
Chris Cromer 89f1ac5303
make dreadtooth animation start automatically 2022-08-04 00:56:14 -04:00
Chris Cromer 09916a0598
Merge branch 'develop' into feature/enemies 2022-08-03 21:40:09 -04:00
Chris Cromer 457915a46a
add CRT shader 2022-08-03 21:38:13 -04:00
Chris Cromer 4267332d70
move the level instance to a level node so that pausing the game doesn't effect the main node 2022-08-03 21:25:19 -04:00
Martin Araneda e54e3b0687 changes to coinHUD 2022-08-01 15:05:09 -04:00
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 f9e70eae01
connect signals to the dreadteeth 2022-07-27 00:03:18 -04:00
Chris Cromer 8cfa1d5cce
add sounds and adjust music 2022-07-26 23:14:21 -04:00
Chris Cromer d50d5063b8
Merge branch 'develop' into feature/enemies 2022-07-23 13:47:05 -04:00
Chris Cromer 6b86126127
gui focus changes and limits 2022-07-23 13:45:09 -04:00
Chris Cromer 8eabc38a91
Merge branch 'develop' into feature/enemies 2022-07-23 13:28:52 -04:00
Chris Cromer 5c4106246c
fix error that happens after the GUI is freed 2022-07-23 13:27:21 -04:00
Chris Cromer 332ac5b028
Merge branch 'develop' into feature/enemies 2022-07-23 13:07:55 -04:00
Chris Cromer 71bf91fd2f make ui_accept press the button 2022-07-23 13:03:35 -04:00
Chris Cromer 1398f3d92c GUI should not be visible until ready 2022-07-23 13:03:35 -04:00
Chris Cromer 4f8c134bb7
add level 2 music 2022-07-22 00:10:08 -04:00
Chris Cromer d35993d072
add comment to _on_player_touched 2022-07-21 20:54:06 -04:00
Chris Cromer edd24b6798
undo accidental collision extents change 2022-07-21 00:17:12 -04:00
Chris Cromer 948f4ce911
add some enemy behavior prototypes 2022-07-21 00:05:08 -04:00
Chris Cromer 31003a2863
Merge branch 'develop' into feature/enemies 2022-07-19 22:11:53 -04:00
Chris Cromer 84eb228a6c fix bug with RUT validation 2022-07-19 21:44:28 -04:00
Chris Cromer ae40849c21 validate information and send it to the monitor 2022-07-19 21:44:28 -04:00
Chris Cromer 39d0804268 remove default text from text inputs 2022-07-19 21:44:28 -04:00
Chris Cromer e4b91d2739 pause game when starting 2022-07-19 21:44:28 -04:00
Chris Cromer 10bf1fd270 add GUI to get player info 2022-07-19 21:44:28 -04:00
Chris Cromer 0d1613a7ef add pixel operator fonts 2022-07-19 21:44:28 -04:00
Chris Cromer 0d2b9cb67f remove player script 2022-07-19 21:44:28 -04:00
Chris Cromer 298298359b move code into the start monitor function instead of setting it during initialization 2022-07-19 21:44:28 -04:00
Chris Cromer cf20410bc8 add player node which will be used to capture their info from the HUD 2022-07-19 21:44:28 -04:00
Chris Cromer f582a32124 allow starting and stopping the monitor via signal 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
Chris Cromer d79864c05d start monitor scene 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
Chris Cromer 28f7af6c73
add enemies collision name to project 2022-06-17 11:35:56 -04:00
Chris Cromer 9aafc64ba7
add enemies prototype level 2022-06-17 11:35:15 -04:00