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

70 Commits

Author SHA1 Message Date
Chris Cromer fe9cebc620
fix notifier bug, it only effected the exported game 2022-09-01 12:26:59 -04:00
Chris Cromer d560d13627
fix pause bug when monitor isn't present 2022-09-01 12:26:26 -04:00
Chris Cromer 629c41c235
fix spacing 2022-09-01 11:31:23 -04:00
Chris Cromer 5d611f790d
make the restart button send the game started event 2022-09-01 11:30:58 -04:00
Chris Cromer e29492447d
change the way level gets loaded and use the event bus 2022-09-01 11:30:01 -04:00
Chris Cromer ea83bf8660
add new events 2022-09-01 11:24:46 -04:00
Chris Cromer 08216d061c
add a win screen when the flag is reached 2022-08-31 01:07:56 -04:00
Chris Cromer eb14adbb0e
add the godot namespace to the calls so it is more clear where the method resides 2022-08-31 00:36:01 -04:00
Chris Cromer ee34563424
add player won signal 2022-08-31 00:24:38 -04:00
Chris Cromer 8863a74c09
remove node include 2022-08-31 00:24:02 -04:00
Chris Cromer bc82d3d08c
fix header guards 2022-08-31 00:05:08 -04:00
Chris Cromer 12df454946
add some more checks to make sure a node is loaded before using it 2022-08-29 20:48:29 -04:00
Chris Cromer a34ca72577
fix sounds when jumping on enemy 2022-08-29 20:17:12 -04:00
Chris Cromer b9570c5f16
play jump sound when bouncing on enemy 2022-08-28 01:57:37 -04:00
Chris Cromer 39173cef21
cleanup code 2022-08-28 01:08:04 -04:00
Chris Cromer 156d3ddcae
Merge branch 'develop' into feature/cleanup 
# Conflicts:
#	src/godot.cpp
#	src/player/Player.cpp
 2022-08-28 00:38:08 -04:00
Martin Araneda 3bcbde8161 Game over screen finished 2022-08-27 22:34:18 -04:00
Martin Araneda 705ed4e897 Use event bus for coins 2022-08-27 18:32:33 -04:00
Martin Araneda 8b53f74929 Merge branch 'develop' into feature/Coin 2022-08-27 18:17:58 -04:00
Martin Araneda a27f968297 add gameover 2022-08-27 18:14:21 -04:00
Chris Cromer 3eb3d8765a
add event bus 2022-08-27 18:10:36 -04:00
Chris Cromer c102c2ad3f
use empty PackedScene instead of nullptr 2022-08-27 00:25:15 -04:00
Chris Cromer 9e0d428ffa
include forgotten header 2022-08-26 23:57:12 -04:00
Chris Cromer 1a2c5eab98
improve default values 2022-08-26 23:56:30 -04:00
Chris Cromer ddb630ca3e
change NULL to nullptr 2022-08-26 21:43:09 -04:00
Chris Cromer 3478127e86
remove main namespace 2022-08-26 21:02:40 -04:00
Chris Cromer 0f4e77d4b7
cleanup c++ code 2022-08-26 19:27:57 -04:00
Chris Cromer a9f26a8408
Merge branch 'develop' into feature/Coin 
# Conflicts:
#	godot/Main.tscn
#	godot/project.godot
 2022-08-26 13:54:25 -04:00
Chris Cromer b74a8ce1aa
fix function name and pointer usage 2022-08-26 13:51:19 -04:00
Chris Cromer ff600cd761
fix spacing 2022-08-26 13:48:59 -04:00
Chris Cromer 563cdade00
refactor code to be more decoupled 2022-08-14 16:53:44 -04:00
Chris Cromer 2a7b20ed54
dynamically load monitor and crt shader 2022-08-14 15:15:36 -04:00
Chris Cromer e7fb9dff03
fix incorrect name in log 2022-08-14 13:18:09 -04:00
Martin Araneda 64102a992a GameOverScreen .h/.cpp made. Godot scene completed 2022-08-12 21:50:48 -04:00
Chris Cromer 09916a0598
Merge branch 'develop' into feature/enemies 2022-08-03 21:40:09 -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 18a7cac068
change dot vector check to be greater than 0 2022-07-27 00:03:59 -04:00
Chris Cromer 8cfa1d5cce
add sounds and adjust music 2022-07-26 23:14:21 -04:00
Chris Cromer d35993d072
add comment to _on_player_touched 2022-07-21 20:54:06 -04:00
Chris Cromer 948f4ce911
add some enemy behavior prototypes 2022-07-21 00:05:08 -04:00
Chris Cromer e4b91d2739 pause game when starting 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
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