Proyecto-Titulo
/
alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity
257 Commits 2 Branches 2 Tags 7.6 MiB
Commit Graph

134 Commits

Author SHA1 Message Date
Chris Cromer 8e5c035675
fix monitor bug where player info wasn't being sent 2022-08-14 12:42:49 -04:00
Martin Araneda 64102a992a GameOverScreen .h/.cpp made. Godot scene completed 2022-08-12 21:50:48 -04:00
Chris Cromer 5d1f634e08
Merge branch 'develop' into feature/enemies 2022-08-06 16:49:30 -04:00
Chris Cromer eb22e8b883
fix text spacing 2022-08-06 16:47:23 -04:00
Chris Cromer 81faf5d32e
Merge branch 'develop' into feature/enemies 2022-08-05 13:57:21 -04:00
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 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 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 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 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
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
Chris Cromer 4196f4d9e9
change collision layers and masks 2022-06-17 11:33:58 -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
Chris Cromer 7d62b37ffc
add enemy scenes 2022-05-25 16:13:29 -04:00
Martin Araneda 20e2fafcf4 Coin state machines archives created but not functional 2022-05-24 23:17:16 -04:00
Martin Araneda a079d8aa37 changes to coin 2022-05-24 15:23:29 -04:00
Martin Araneda 57289dcb8f Coin added to prototype 2022-05-20 12:50:47 -04:00
Chris Cromer 4a64951f28
reimport levels with y sorting disabled 2022-04-23 15:48:25 -04:00
Chris Cromer 2280e72ff1
optimize tiled imports by disabling y sorting 2022-04-23 15:39:47 -04:00
Chris Cromer 6874c86786
change default player direction to the right 2022-04-21 23:33:00 -04:00
Chris Cromer 69e4d0d6fc
remove temporary gdscript camera limit 2022-04-20 11:48:57 -04:00
Chris Cromer 8edcae5adc
add camera limit script 2022-04-20 11:48:11 -04:00
Chris Cromer 9adf91c231
Merge branch 'develop' into feature/tilesets 
# Conflicts:
#	godot/Main.tscn
#	godot/levels/Level2.tmx
#	godot/levels/Level2.tmx.import
#	godot/tilesets/tiles.tsx
 2022-04-20 10:22:52 -04:00
Chris Cromer a314f33b94
move object art into separate files 2022-04-20 00:37:59 -04:00
Chris Cromer c88a8615b2
update level2 2022-04-19 23:48:49 -04:00
Chris Cromer 6c1ee2c12b make level dynamic from main 2022-04-16 20:04:15 -04:00
Chris Cromer bc33004f7d remove object layer 2022-04-16 20:04:15 -04:00
Chris Cromer 50df0a7865 update maps and tilesets 2022-04-16 20:04:15 -04:00
Chris Cromer 73e4e442c3 add zstd support and fix a bug 2022-04-16 20:04:15 -04:00
Chris Cromer a89283ea36 rename tiled file name 2022-04-16 20:04:15 -04:00
Chris Cromer dab20270be
make level dynamic from main 2022-04-16 17:20:45 -04:00
Chris Cromer cdaa32ce17
remove object layer 2022-04-16 16:03:41 -04:00
Chris Cromer a11370c784
update maps and tilesets 2022-04-16 14:21:15 -04:00
Chris Cromer 9b0102ee44
add zstd support and fix a bug 2022-04-16 14:19:59 -04:00
Chris Cromer 5a644d78c3
rename tiled file name 2022-04-13 11:23:20 -04:00
Chris Cromer 8bbf3942cd
fix incorrect gdnative resource 2022-04-13 01:10:40 -04:00
Chris Cromer ecd6fe45b2
add state machine and have player use it 2022-04-11 13:30:51 -04:00
Chris Cromer 35af76cda4
detatch script 2022-04-09 22:21:04 -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 aeb3816ded
change player collision shape to a rectangle 2022-04-06 23:43:23 -04:00
Chris Cromer dffd810183
recenter player in 0,0 2022-04-06 23:27:40 -04:00
Chris Cromer c635f64d3f
rename level 1 file 2022-04-06 23:09:30 -04:00
Chris Cromer 98a3a04e6a
remove default environment since it is not needed 2022-04-06 22:54:54 -04:00
Chris Cromer 02e6e54e2b
tweak project settings 2022-04-06 22:54:35 -04:00
Chris Cromer bfb535cad3
reimport icon as lossless 2D pixel art 2022-04-06 22:50:07 -04:00
Chris Cromer a2ad48e900
prototype 2022-04-05 14:51:59 -04:00