Commit Graph

34 Commits

Author SHA1 Message Date
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 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 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
Chris Cromer 7ca849f361 Merge pull request 'develop' (#3) from develop into master
Reviewed-on: Proyecto-Titulo/juego#3
2022-04-05 15:08:59 -04:00
Chris Cromer 3e67369f90 remove vscode project file 2022-04-05 15:08:59 -04:00
Chris Cromer 755e774335 Merge pull request 'remove vscode project file' (#2) from remove_vscode_file into develop
Reviewed-on: Proyecto-Titulo/juego#2
2022-04-05 15:08:07 -04:00
Chris Cromer 16dbc35926
remove vscode project file 2022-04-05 15:05:53 -04:00
Chris Cromer e9b9007c3d Merge pull request 'prototype' (#1) from develop into master
Reviewed-on: Proyecto-Titulo/juego#1
2022-04-05 14:59:54 -04:00
Chris Cromer a2ad48e900
prototype 2022-04-05 14:51:59 -04:00
Chris Cromer 4599cff7b3
initial commit 2022-01-17 00:58:56 -03:00