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

224 Commits

Author SHA1 Message Date
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
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 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 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 3e63355826
Merge branch 'develop' 
# Conflicts:
#	godot/Main.tscn
#	godot/levels/Level2.tmx
#	godot/levels/Level2.tmx.import
 2022-04-20 10:31:21 -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 70e9c00620 Merge pull request 'move object art into separate files' (#11) from feature/art into develop 
Reviewed-on: #11
 2022-04-20 00:39:41 -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 b6a8177f49 Merge pull request 'develop' (#10) from develop into master 
Reviewed-on: #10
 2022-04-16 20:05:31 -04:00
Chris Cromer 97d84ef36a make level dynamic from main 2022-04-16 20:05:32 -04:00
Chris Cromer f3656fe4b4 remove object layer 2022-04-16 20:05:32 -04:00
Chris Cromer ef4ec86071 update maps and tilesets 2022-04-16 20:05:32 -04:00
Chris Cromer 825e309372 add zstd support and fix a bug 2022-04-16 20:05:32 -04:00
Chris Cromer dff7c7b78b ignore tiled session files 2022-04-16 20:05:32 -04:00
Chris Cromer c803a62a01 rename tiled file name 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 ec64717393 Merge pull request 'feature/tilesets' (#9) from feature/tilesets into develop 
Reviewed-on: #9
 2022-04-16 20:04:15 -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 b791768ec1 ignore tiled session files 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 97e38b4b51 Merge pull request 'improve error messages and checking' (#8) from feature/improve-state-machine into develop 
Reviewed-on: #8
 2022-04-16 15:58:20 -04:00
Chris Cromer 53ce0bd1ff
improve error messages and checking 2022-04-16 15:54:05 -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 4f4d6b0a03
ignore tiled session files 2022-04-13 11:23:59 -04:00
Chris Cromer 5a644d78c3
rename tiled file name 2022-04-13 11:23:20 -04:00
Chris Cromer 3ad9bd9d99 Merge branch 'master' into develop 2022-04-13 09:52:03 -04:00
Chris Cromer 05ff88ee5f
merge develop 2022-04-13 09:50:11 -04:00
Chris Cromer 6ea66d4e07 Merge pull request 'feature/state_machine' (#5) from feature/state_machine into develop 
Reviewed-on: Proyecto-Titulo/juego#5
 2022-04-13 09:39:41 -04:00
Chris Cromer 8bbf3942cd
fix incorrect gdnative resource 2022-04-13 01:10:40 -04:00