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

257 Commits

Author SHA1 Message Date
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
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 35af76cda4
detatch script 2022-04-09 22:21:04 -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 b3392035c9 Merge pull request 'tweaks' (#4) from tweaks into develop 
Reviewed-on: Proyecto-Titulo/juego#4
 2022-04-09 21:51:22 -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 fac339926b
change speed back to 60.0 2022-04-06 22:46:31 -04:00
Chris Cromer cdb0fbe3f7
ignore any filename for code workspaces 2022-04-06 22:38:26 -04:00