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 2443caba88 Merge branch 'master' into develop 2022-08-28 01:13:17 -04:00
Chris Cromer a57c4d420f Merge pull request 'feature/cleanup' (#33) from feature/cleanup into develop 
Reviewed-on: #33
 2022-08-28 01:09:29 -04:00
Chris Cromer 39173cef21
cleanup code 2022-08-28 01:08:04 -04:00
Chris Cromer 3c8107ba9f
disable monitor by default in development 2022-08-28 01:04:47 -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
Chris Cromer 1f4d2b1b72 Merge pull request 'feature/Coin' (#32) from feature/Coin into develop 
Reviewed-on: #32
 2022-08-27 22:39:00 -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
Chris Cromer 195c7015af Merge pull request 'add event bus' (#31) from feature/event_bus into develop 
Reviewed-on: #31
 2022-08-27 18:16:28 -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 7083f680ee
ignore delta since we don't use it 2022-08-26 13:48:39 -04:00
Chris Cromer 2f3ae6e17c Merge pull request 'develop' (#30) from develop into master 
Reviewed-on: #30
 2022-08-26 10:53:58 -04:00
Chris Cromer 8321c8a610 Merge pull request 'feature/fix_monitor' (#29) from feature/fix_monitor into develop 
Reviewed-on: #29
 2022-08-26 10:53:09 -04:00
Chris Cromer 0c8c3f6d1b
fix level not loading when monitor is disabled 2022-08-26 10:51:16 -04:00
Chris Cromer bb0c4e302d
submit form when enter is pressed 2022-08-25 10:11:46 -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
Chris Cromer 0000cd114c
add default player info for quicker development 2022-08-14 12:43:25 -04:00
Chris Cromer 8e5c035675
fix monitor bug where player info wasn't being sent 2022-08-14 12:42:49 -04:00
Martin Araneda 64102a992a GameOverScreen .h/.cpp made. Godot scene completed 2022-08-12 21:50:48 -04:00
Chris Cromer 0ca95eacce Merge pull request 'feature/enemies' (#28) from feature/enemies into develop 
Reviewed-on: #28
 2022-08-07 18:54:14 -04:00
Chris Cromer 5d1f634e08
Merge branch 'develop' into feature/enemies 2022-08-06 16:49:30 -04:00
Chris Cromer eb22e8b883
fix text spacing 2022-08-06 16:47:23 -04:00
Chris Cromer 81faf5d32e
Merge branch 'develop' into feature/enemies 2022-08-05 13:57:21 -04:00
Chris Cromer 0f85d5cfa3
use the Time singleton instead of OS singleton 
time functions in OS are being deprecated and will be removed in gotod 4.0
 2022-08-05 13:23:45 -04:00
Chris Cromer 7a3b29a419
Merge branch 'develop' into feature/enemies 2022-08-05 12:16:52 -04:00
Chris Cromer 0d0fb42698
add godot-cpp 3.5 submodule 2022-08-05 12:06:45 -04:00
Chris Cromer c3986d34a4
remove godot-cpp submodule 2022-08-05 12:04:22 -04:00
Chris Cromer d0ad886184
remove godot-cpp submodule 2022-08-05 12:03:59 -04:00
Chris Cromer 5ce3a2f37c
add blightwing prototype example 2022-08-04 00:59:48 -04:00
Chris Cromer a72954b578
add blightwing's behavior 2022-08-04 00:59:10 -04:00
Chris Cromer 89f1ac5303
make dreadtooth animation start automatically 2022-08-04 00:56:14 -04:00
Chris Cromer 09916a0598
Merge branch 'develop' into feature/enemies 2022-08-03 21:40:09 -04:00
Chris Cromer 457915a46a
add CRT shader 2022-08-03 21:38:13 -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