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

87 Commits

Author SHA1 Message Date
Chris Cromer 9068d4fb25
enhance the AI movement process 2023-03-01 09:19:25 -03:00
Chris Cromer b84ed69198
integrate obelisk into alai 2023-02-26 21:45:25 -03:00
Martin Araneda 1a317042c2 New lvl and related config 2023-02-22 21:16:23 -03:00
Chris Cromer 3b533fb03d
used clang-format to format the code 2022-10-10 21:54:12 -03:00
Martin Araneda e7a1b4f2f8 Added music to VictoryScreen 2022-09-01 23:22:37 -04:00
Martin Araneda e62acd3ab1 final changes to music 2022-09-01 23:22:10 -04:00
Martin Araneda a8e364415c changed coin type format to avoid negatives 2022-09-01 23:21:30 -04:00
Martin Araneda 2c5d3d9afe validation over 100 coins 2022-09-01 23:20:53 -04:00
Martin Araneda 346af5dd44 Merge branch 'develop' into feature/Prototype_R_LEVEL 
# Conflicts:
#	godot/levels/Prototype.tscn
 2022-09-01 22:04:21 -04:00
Martin Araneda ba46d6c65b Make player using the event bus for enemies touching him 2022-09-01 22:00:59 -04:00
Chris Cromer 3ca5f4e7b2
improve coin counter HUD 2022-09-01 18:34:37 -04:00
Martin Araneda 1f63f5e00a Player touched signal added 2022-09-01 16:37:50 -04:00
Martin Araneda 2e07679b52 minor fix 2022-09-01 16:18:38 -04:00
Chris Cromer c002528d49
Merge branch 'develop' into feature/Prototype_R_LEVEL 
# Conflicts:
#	godot/Main.tscn
#	godot/gui/GameOver.tscn
#	src/gui/game_over/GameOverScreen.cpp
 2022-09-01 16:13:55 -04:00
Martin Araneda 3f45f3f5a9 Merge branch 'feature/Prototype_R_LEVEL' into feature/PROTOTYPE_R_SOUNDS 2022-09-01 15:58:59 -04:00
Martin Araneda 7236428157 coin and bgm added, game over music still not done 2022-09-01 15:55:02 -04:00
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
Martin Araneda 0e4bad4823 R prototype lvl made. Coins and coinHUD added 2022-08-28 20:15:40 -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