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 16fb77e0de Merge pull request 'develop' (#63) from develop into master 
Reviewed-on: #63
 2023-03-01 22:25:14 -03:00
Chris Cromer 33d9401445 Merge branch 'master' into develop 2023-03-01 22:25:08 -03:00
Chris Cromer 77d844c911 Merge pull request 'feature/finishing_touches' (#62) from feature/finishing_touches into develop 
Reviewed-on: #62
 2023-03-01 22:24:46 -03:00
Chris Cromer 368ca33006
prepare 1.1.0 2023-03-01 22:19:56 -03:00
Chris Cromer 9068d4fb25
enhance the AI movement process 2023-03-01 09:19:25 -03:00
Chris Cromer acf6ed6f73
update the knowledge base for the dreadtooth enemy type 2023-03-01 09:14:36 -03:00
Chris Cromer 4860855cc8
swap second shelly for a dreadtooth 2023-03-01 09:13:53 -03:00
Chris Cromer 354a3c6946 Merge pull request 'develop' (#61) from develop into master 
Reviewed-on: #61
 2023-02-26 21:49:11 -03:00
Chris Cromer bb56fff04e Merge branch 'master' into develop 2023-02-26 21:49:05 -03:00
Chris Cromer 27403e7e9a Merge pull request 'thesislvl' (#60) from thesislvl into develop 
Reviewed-on: #60
 2023-02-26 21:48:09 -03:00
Chris Cromer b84ed69198
integrate obelisk into alai 2023-02-26 21:45:25 -03:00
Martin Araneda 937e173fce thesis lvl fix 2023-02-22 23:12:21 -03:00
Martin Araneda 1a317042c2 New lvl and related config 2023-02-22 21:16:23 -03:00
Chris Cromer 3cc4252684 Merge pull request 'develop' (#59) from develop into master 
Reviewed-on: #59
 2022-10-10 22:37:32 -03:00
Chris Cromer 91b55ca6e1 Merge branch 'master' into develop 2022-10-10 22:37:26 -03:00
Chris Cromer 1e60846d3c Merge pull request 'remove license adding from pre-commit' (#58) from feature/copyright into develop 
Reviewed-on: #58
 2022-10-10 22:37:11 -03:00
Chris Cromer 498d575d29
remove license adding from pre-commit 2022-10-10 22:36:15 -03:00
Chris Cromer 581d8e71cf Merge pull request 'develop' (#57) from develop into master 
Reviewed-on: #57
 2022-10-10 22:05:25 -03:00
Chris Cromer dd58fac7a7 Merge branch 'master' into develop 2022-10-10 22:04:55 -03:00
Chris Cromer 17fe82323c Merge pull request 'add pre-commit hook' (#56) from feature/clang-format into develop 
Reviewed-on: #56
 2022-10-10 22:04:07 -03:00
Chris Cromer 364b9ac898 add pre-commit hook 2022-10-10 22:03:14 -03:00
Chris Cromer 298a21d516 Merge pull request 'develop' (#55) from develop into master 
Reviewed-on: #55
 2022-10-10 21:57:13 -03:00
Chris Cromer b76ef9cda5 Merge branch 'master' into develop 2022-10-10 21:57:04 -03:00
Chris Cromer 4482c8af6a Merge pull request 'feature/clang-format' (#54) from feature/clang-format into develop 
Reviewed-on: #54
 2022-10-10 21:56:16 -03:00
Chris Cromer 3b533fb03d
used clang-format to format the code 2022-10-10 21:54:12 -03:00
Chris Cromer 57cc75c249
add .clang-format 2022-10-10 21:25:56 -03:00
Chris Cromer 4298dfb4c0 Merge pull request 'disable monitor key if not debugging' (#53) from feature/disable_monitor_key into develop 
Reviewed-on: #53
 2022-09-22 16:48:44 -03:00
Chris Cromer 73b41dcde3
disable monitor key if not debugging 2022-09-22 16:47:51 -03:00
Chris Cromer dad3e6581a Merge pull request 'feature/anonymous_monitor' (#52) from feature/anonymous_monitor into develop 
Reviewed-on: #52
 2022-09-22 16:43:14 -03:00
Chris Cromer b8146bd002
allow anonymous player monitoring 2022-09-22 16:42:24 -03:00
Chris Cromer aae40bf6e7
update to version 1.1.0 2022-09-22 16:01:09 -03:00
Chris Cromer 7ecaa95045 Merge pull request 'fix bug that causes monitor's start time to be higher than 0 when entering player info' (#51) from feature/fix_monitor into develop 
Reviewed-on: #51
 2022-09-22 15:58:58 -03:00
Chris Cromer 0a54849e5f
fix bug that causes monitor's start time to be higher than 0 when entering player info 2022-09-03 22:46:35 -04:00
Chris Cromer 74d081abbf Merge pull request 'develop' (#50) from develop into master 
Reviewed-on: #50
 2022-09-02 00:37:33 -04:00
Chris Cromer 54cea89810 Merge branch 'master' into develop 2022-09-02 00:37:22 -04:00
Chris Cromer 03c9614f4d Merge pull request 'ready for version 1.0.0' (#49) from feature/version_change into develop 
Reviewed-on: #49
 2022-09-01 23:32:03 -04:00
Chris Cromer 729d808086
ready for version 1.0.0 2022-09-01 23:31:23 -04:00
Martin Araneda 28ba710581 Merge pull request 'feature/music' (#48) from feature/music into develop 
Reviewed-on: #48
 2022-09-01 23:25:14 -04:00
Martin Araneda 866944b784 Added victory sound to assets 2022-09-01 23:22:56 -04: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
Chris Cromer c09c52797c Merge pull request 'feature/Prototype_R_LEVEL' (#47) from feature/Prototype_R_LEVEL into develop 
Reviewed-on: #47
 2022-09-01 22:36:03 -04:00
Martin Araneda fa4cff9c57 Added some visual details to the PrototypeR map 2022-09-01 22:33:43 -04:00
Martin Araneda e6b170e4d8 Remove unused signals 2022-09-01 22:32:52 -04:00
Martin Araneda 9388e6f6f5 Added some enemies 2022-09-01 22:21:13 -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 bc572df9f9 Added coins and enemies to the PrototypeR map 2022-09-01 22:01:45 -04:00
Martin Araneda 8adf91247e Adjust jump volume 2022-09-01 22:01:16 -04:00