Commit Graph

Select branches

Hide Pull Requests

develop

master

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#7

#8

#9

1.0.0

1.1.0

Mono Color

• 16fb77e0de Merge pull request 'develop' (#63) from develop into master master 1.1.0 Chris Cromer 2023-03-01 22:25:14 -0300
• 33d9401445 Merge branch 'master' into develop #63 develop Chris Cromer 2023-03-01 22:25:08 -0300
• 77d844c911 Merge pull request 'feature/finishing_touches' (#62) from feature/finishing_touches into develop Chris Cromer 2023-03-01 22:24:46 -0300
• 368ca33006
  
  prepare 1.1.0 #62 Chris Cromer 2023-03-01 22:19:56 -0300
• 9068d4fb25
  
  enhance the AI movement process Chris Cromer 2023-03-01 09:19:25 -0300
• acf6ed6f73
  
  update the knowledge base for the dreadtooth enemy type Chris Cromer 2023-03-01 09:14:36 -0300
• 4860855cc8
  
  swap second shelly for a dreadtooth Chris Cromer 2023-03-01 09:13:53 -0300
• 354a3c6946 Merge pull request 'develop' (#61) from develop into master Chris Cromer 2023-02-26 21:49:11 -0300
• bb56fff04e Merge branch 'master' into develop #61 Chris Cromer 2023-02-26 21:49:05 -0300
• 27403e7e9a Merge pull request 'thesislvl' (#60) from thesislvl into develop Chris Cromer 2023-02-26 21:48:09 -0300
• b84ed69198
  
  integrate obelisk into alai #60 Chris Cromer 2023-02-26 21:45:25 -0300
• 937e173fce thesis lvl fix Martin Araneda 2023-02-22 23:12:21 -0300
• 1a317042c2 New lvl and related config Martin Araneda 2023-02-22 21:16:23 -0300
• 3cc4252684 Merge pull request 'develop' (#59) from develop into master Chris Cromer 2022-10-10 22:37:32 -0300
• 91b55ca6e1 Merge branch 'master' into develop #59 Chris Cromer 2022-10-10 22:37:26 -0300
• 1e60846d3c Merge pull request 'remove license adding from pre-commit' (#58) from feature/copyright into develop Chris Cromer 2022-10-10 22:37:11 -0300
• 498d575d29
  
  remove license adding from pre-commit #58 Chris Cromer 2022-10-10 22:36:15 -0300
• 581d8e71cf Merge pull request 'develop' (#57) from develop into master Chris Cromer 2022-10-10 22:05:25 -0300
• dd58fac7a7 Merge branch 'master' into develop #57 Chris Cromer 2022-10-10 22:04:55 -0300
• 17fe82323c Merge pull request 'add pre-commit hook' (#56) from feature/clang-format into develop Chris Cromer 2022-10-10 22:04:07 -0300
• 364b9ac898 add pre-commit hook #56 Chris Cromer 2022-10-10 22:02:00 -0300
• 298a21d516 Merge pull request 'develop' (#55) from develop into master Chris Cromer 2022-10-10 21:57:13 -0300
• b76ef9cda5 Merge branch 'master' into develop #55 Chris Cromer 2022-10-10 21:57:04 -0300
• 4482c8af6a Merge pull request 'feature/clang-format' (#54) from feature/clang-format into develop Chris Cromer 2022-10-10 21:56:16 -0300
• 3b533fb03d
  
  used clang-format to format the code #54 Chris Cromer 2022-10-10 21:54:12 -0300
• 57cc75c249
  
  add .clang-format Chris Cromer 2022-10-10 21:25:56 -0300
• 4298dfb4c0 Merge pull request 'disable monitor key if not debugging' (#53) from feature/disable_monitor_key into develop Chris Cromer 2022-09-22 16:48:44 -0300
• 73b41dcde3
  
  disable monitor key if not debugging #53 Chris Cromer 2022-09-22 16:47:51 -0300
• dad3e6581a Merge pull request 'feature/anonymous_monitor' (#52) from feature/anonymous_monitor into develop Chris Cromer 2022-09-22 16:43:14 -0300
• b8146bd002
  
  allow anonymous player monitoring #52 Chris Cromer 2022-09-22 16:42:24 -0300
• aae40bf6e7
  
  update to version 1.1.0 Chris Cromer 2022-09-22 16:01:09 -0300
• 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 Chris Cromer 2022-09-22 15:58:58 -0300
• 0a54849e5f
  
  fix bug that causes monitor's start time to be higher than 0 when entering player info #51 Chris Cromer 2022-09-03 22:46:35 -0400
• 74d081abbf Merge pull request 'develop' (#50) from develop into master 1.0.0 Chris Cromer 2022-09-02 00:37:33 -0400
• 54cea89810 Merge branch 'master' into develop #50 Chris Cromer 2022-09-02 00:37:22 -0400
• 03c9614f4d Merge pull request 'ready for version 1.0.0' (#49) from feature/version_change into develop Chris Cromer 2022-09-01 23:32:03 -0400
• 729d808086
  
  ready for version 1.0.0 #49 Chris Cromer 2022-09-01 23:31:23 -0400
• 28ba710581 Merge pull request 'feature/music' (#48) from feature/music into develop Martin Araneda 2022-09-01 23:25:14 -0400
• 866944b784 Added victory sound to assets #48 Martin Araneda 2022-09-01 23:22:56 -0400
• e7a1b4f2f8 Added music to VictoryScreen Martin Araneda 2022-09-01 23:22:37 -0400
• e62acd3ab1 final changes to music Martin Araneda 2022-09-01 23:22:10 -0400
• a8e364415c changed coin type format to avoid negatives Martin Araneda 2022-09-01 23:21:30 -0400
• 2c5d3d9afe validation over 100 coins Martin Araneda 2022-09-01 23:20:53 -0400
• c09c52797c Merge pull request 'feature/Prototype_R_LEVEL' (#47) from feature/Prototype_R_LEVEL into develop Chris Cromer 2022-09-01 22:36:03 -0400
• fa4cff9c57 Added some visual details to the PrototypeR map #47 Martin Araneda 2022-09-01 22:33:43 -0400
• e6b170e4d8 Remove unused signals Martin Araneda 2022-09-01 22:32:52 -0400
• 9388e6f6f5 Added some enemies Martin Araneda 2022-09-01 22:21:13 -0400
• 346af5dd44 Merge branch 'develop' into feature/Prototype_R_LEVEL Martin Araneda 2022-09-01 22:04:21 -0400
• bc572df9f9 Added coins and enemies to the PrototypeR map Martin Araneda 2022-09-01 22:01:45 -0400
• 8adf91247e Adjust jump volume Martin Araneda 2022-09-01 22:01:16 -0400
• ba46d6c65b Make player using the event bus for enemies touching him Martin Araneda 2022-09-01 22:00:59 -0400
• 6c0b656d79 change music file name Martin Araneda 2022-09-01 21:59:58 -0400
• 011a1b8007 make the enemies use the event bus Martin Araneda 2022-09-01 21:59:21 -0400
• 615b2a0ba2 Merge pull request 'improve coin counter HUD' (#46) from feature/cleanup_coin_counter into develop Chris Cromer 2022-09-01 18:35:59 -0400
• 3ca5f4e7b2
  
  improve coin counter HUD #46 Chris Cromer 2022-09-01 18:34:37 -0400
• 1f63f5e00a Player touched signal added Martin Araneda 2022-09-01 16:37:50 -0400
• 2e07679b52 minor fix Martin Araneda 2022-09-01 16:18:38 -0400
• c002528d49
  
  Merge branch 'develop' into feature/Prototype_R_LEVEL Chris Cromer 2022-09-01 16:13:55 -0400
• 46f32da8ff Merge pull request 'feature/PROTOTYPE_R_SOUNDS' (#45) from feature/PROTOTYPE_R_SOUNDS into feature/Prototype_R_LEVEL Martin Araneda 2022-09-01 15:59:13 -0400
• 3f45f3f5a9 Merge branch 'feature/Prototype_R_LEVEL' into feature/PROTOTYPE_R_SOUNDS #45 Martin Araneda 2022-09-01 15:58:59 -0400
• 7236428157 coin and bgm added, game over music still not done Martin Araneda 2022-09-01 15:55:02 -0400
• 2818e210c9 Merge pull request 'feature/monitor_debug' (#44) from feature/monitor_debug into develop Chris Cromer 2022-09-01 13:03:32 -0400
• e981295e5f
  
  fix windows build gnu++17 doesn't support inline variables but c++17 does #44 Chris Cromer 2022-09-01 12:28:00 -0400
• fe9cebc620
  
  fix notifier bug, it only effected the exported game Chris Cromer 2022-09-01 12:26:59 -0400
• d560d13627
  
  fix pause bug when monitor isn't present Chris Cromer 2022-09-01 12:26:26 -0400
• 083db48f04
  
  rename directory to lowercase Chris Cromer 2022-09-01 11:31:47 -0400
• 629c41c235
  
  fix spacing Chris Cromer 2022-09-01 11:31:23 -0400
• 5d611f790d
  
  make the restart button send the game started event Chris Cromer 2022-09-01 11:30:58 -0400
• e29492447d
  
  change the way level gets loaded and use the event bus Chris Cromer 2022-09-01 11:30:01 -0400
• cb81734279
  
  make enemies use the event bus Chris Cromer 2022-09-01 11:26:34 -0400
• ea83bf8660
  
  add new events Chris Cromer 2022-09-01 11:24:46 -0400
• df420f698d Merge pull request 'feature/win_screen' (#43) from feature/win_screen into develop Chris Cromer 2022-08-31 01:11:58 -0400
• 08216d061c
  
  add a win screen when the flag is reached #43 Chris Cromer 2022-08-31 01:07:56 -0400
• eb14adbb0e
  
  add the godot namespace to the calls so it is more clear where the method resides Chris Cromer 2022-08-31 00:36:01 -0400
• ee34563424
  
  add player won signal Chris Cromer 2022-08-31 00:24:38 -0400
• 8863a74c09
  
  remove node include Chris Cromer 2022-08-31 00:24:02 -0400
• bc82d3d08c
  
  fix header guards Chris Cromer 2022-08-31 00:05:08 -0400
• 0f94363266
  
  refactor game over screen Chris Cromer 2022-08-30 23:58:02 -0400
• 08c815ba65 Merge pull request 'develop' (#42) from develop into master Chris Cromer 2022-08-29 21:46:11 -0400
• 9cc3dc0978 Merge branch 'master' into develop #42 Chris Cromer 2022-08-29 21:46:01 -0400
• bad5a35339 Merge pull request 'set coins and points back to 0 on start' (#41) from feature/monitor into develop Chris Cromer 2022-08-29 21:45:35 -0400
• 5c671a2fec
  
  set coins and points back to 0 on start #41 Chris Cromer 2022-08-29 21:44:08 -0400
• 066012bd1b Merge pull request 'develop' (#40) from develop into master Chris Cromer 2022-08-29 20:51:15 -0400
• 53c17f9e43 Merge branch 'master' into develop #40 Chris Cromer 2022-08-29 20:51:09 -0400
• 63cb0ef4be Merge pull request 'feature/fix_enemies' (#39) from feature/fix_enemies into develop Chris Cromer 2022-08-29 20:50:48 -0400
• 12df454946
  
  add some more checks to make sure a node is loaded before using it #39 Chris Cromer 2022-08-29 20:48:29 -0400
• a34ca72577
  
  fix sounds when jumping on enemy Chris Cromer 2022-08-29 20:17:12 -0400
• e972ed4c99 Merge pull request 'develop' (#38) from develop into master Chris Cromer 2022-08-28 20:47:38 -0400
• e5d92c8267 Merge branch 'master' into develop #38 Chris Cromer 2022-08-28 20:47:32 -0400
• 0668f53641 Merge pull request 'feature/lower_volume' (#37) from feature/lower_volume into develop Chris Cromer 2022-08-28 20:46:57 -0400
• 0e4bad4823 R prototype lvl made. Coins and coinHUD added Martin Araneda 2022-08-28 20:15:40 -0400
• 7e57e78205 Revert "no changes" Martin Araneda 2022-08-28 15:04:50 -0400
• b718c0f31b no changes Martin Araneda 2022-08-28 15:02:28 -0400
• b9570c5f16
  
  play jump sound when bouncing on enemy #37 Chris Cromer 2022-08-28 01:57:37 -0400
• 07520324cb
  
  lower default volume Chris Cromer 2022-08-28 01:54:45 -0400
• f8cc1548e6 Merge pull request 'develop' (#36) from develop into master Chris Cromer 2022-08-28 01:28:58 -0400
• 5c78dd3260 Merge branch 'master' into develop #36 Chris Cromer 2022-08-28 01:28:52 -0400
• dc93491cb5 Merge pull request 'fix incorrect method name' (#35) from feature/fix into develop Chris Cromer 2022-08-28 01:26:36 -0400
• 14d29bbc7c
  
  fix incorrect method name #35 Chris Cromer 2022-08-28 01:25:50 -0400
• 816da5060b Merge pull request 'develop' (#34) from develop into master Chris Cromer 2022-08-28 01:13:45 -0400