|
|
d50d5063b8
|
Merge branch 'develop' into feature/enemies
|
2022-07-23 13:47:05 -04:00 |
|
|
|
6b86126127
|
gui focus changes and limits
|
2022-07-23 13:45:09 -04:00 |
|
|
|
8eabc38a91
|
Merge branch 'develop' into feature/enemies
|
2022-07-23 13:28:52 -04:00 |
|
|
|
5c4106246c
|
fix error that happens after the GUI is freed
|
2022-07-23 13:27:21 -04:00 |
|
|
|
332ac5b028
|
Merge branch 'develop' into feature/enemies
|
2022-07-23 13:07:55 -04:00 |
|
|
|
71bf91fd2f
|
make ui_accept press the button
|
2022-07-23 13:03:35 -04:00 |
|
|
|
1398f3d92c
|
GUI should not be visible until ready
|
2022-07-23 13:03:35 -04:00 |
|
|
|
4f8c134bb7
|
add level 2 music
|
2022-07-22 00:10:08 -04:00 |
|
|
|
d35993d072
|
add comment to _on_player_touched
|
2022-07-21 20:54:06 -04:00 |
|
|
|
edd24b6798
|
undo accidental collision extents change
|
2022-07-21 00:17:12 -04:00 |
|
|
|
948f4ce911
|
add some enemy behavior prototypes
|
2022-07-21 00:05:08 -04:00 |
|
|
|
31003a2863
|
Merge branch 'develop' into feature/enemies
|
2022-07-19 22:11:53 -04:00 |
|
|
|
84eb228a6c
|
fix bug with RUT validation
|
2022-07-19 21:44:28 -04:00 |
|
|
|
ae40849c21
|
validate information and send it to the monitor
|
2022-07-19 21:44:28 -04:00 |
|
|
|
39d0804268
|
remove default text from text inputs
|
2022-07-19 21:44:28 -04:00 |
|
|
|
e4b91d2739
|
pause game when starting
|
2022-07-19 21:44:28 -04:00 |
|
|
|
10bf1fd270
|
add GUI to get player info
|
2022-07-19 21:44:28 -04:00 |
|
|
|
0d1613a7ef
|
add pixel operator fonts
|
2022-07-19 21:44:28 -04:00 |
|
|
|
0d2b9cb67f
|
remove player script
|
2022-07-19 21:44:28 -04:00 |
|
|
|
298298359b
|
move code into the start monitor function instead of setting it during initialization
|
2022-07-19 21:44:28 -04:00 |
|
|
|
cf20410bc8
|
add player node which will be used to capture their info from the HUD
|
2022-07-19 21:44:28 -04:00 |
|
|
|
f582a32124
|
allow starting and stopping the monitor via signal
|
2022-07-19 21:44:28 -04:00 |
|
|
|
9f3e78fa94
|
Get monitor working and communicating with backend
|
2022-07-19 21:44:28 -04:00 |
|
|
|
d79864c05d
|
start monitor scene
|
2022-07-19 21:44:28 -04:00 |
|
|
|
26cb0fb86f
|
update tiled importer and fix camera bounds to work with it
|
2022-07-06 18:03:25 -04:00 |
|
|
|
28f7af6c73
|
add enemies collision name to project
|
2022-06-17 11:35:56 -04:00 |
|
|
|
9aafc64ba7
|
add enemies prototype level
|
2022-06-17 11:35:15 -04:00 |
|
|
|
4196f4d9e9
|
change collision layers and masks
|
2022-06-17 11:33:58 -04:00 |
|
|
|
7d62b37ffc
|
add enemy scenes
|
2022-05-25 16:13:29 -04:00 |
|
|
|
4a64951f28
|
reimport levels with y sorting disabled
|
2022-04-23 15:48:25 -04:00 |
|
|
|
2280e72ff1
|
optimize tiled imports by disabling y sorting
|
2022-04-23 15:39:47 -04:00 |
|
|
|
4a2cda5ecd
|
update comments
|
2022-04-22 21:56:22 -04:00 |
|
|
|
8b251776a0
|
fix header path
|
2022-04-22 21:45:46 -04:00 |
|
|
|
e5c4e54fe4
|
add missing CameraLimit class comment
|
2022-04-22 14:13:39 -04:00 |
|
|
|
6874c86786
|
change default player direction to the right
|
2022-04-21 23:33:00 -04:00 |
|
|
|
69e4d0d6fc
|
remove temporary gdscript camera limit
|
2022-04-20 11:48:57 -04:00 |
|
|
|
8edcae5adc
|
add camera limit script
|
2022-04-20 11:48:11 -04:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a314f33b94
|
move object art into separate files
|
2022-04-20 00:37:59 -04:00 |
|
|
|
c88a8615b2
|
update level2
|
2022-04-19 23:48:49 -04:00 |
|
|
|
b6a8177f49
|
Merge pull request 'develop' (#10) from develop into master
Reviewed-on: #10
|
2022-04-16 20:05:31 -04:00 |
|
|
|
97d84ef36a
|
make level dynamic from main
|
2022-04-16 20:05:32 -04:00 |
|
|
|
f3656fe4b4
|
remove object layer
|
2022-04-16 20:05:32 -04:00 |
|
|
|
ef4ec86071
|
update maps and tilesets
|
2022-04-16 20:05:32 -04:00 |
|
|
|
825e309372
|
add zstd support and fix a bug
|
2022-04-16 20:05:32 -04:00 |
|
|
|
dff7c7b78b
|
ignore tiled session files
|
2022-04-16 20:05:32 -04:00 |
|
|
|
c803a62a01
|
rename tiled file name
|
2022-04-16 20:05:32 -04:00 |
|
|
|
db51a218ec
|
improve error messages and checking
|
2022-04-16 20:05:32 -04:00 |
|
