Commit Graph

38 Commits

Author SHA1 Message Date
Chris Cromer 4860855cc8
swap second shelly for a dreadtooth 2023-03-01 09:13:53 -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
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 6c0b656d79 change music file name 2022-09-01 21:59:58 -04:00
Chris Cromer 3ca5f4e7b2
improve coin counter HUD 2022-09-01 18:34:37 -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
Martin Araneda 0e4bad4823 R prototype lvl made. Coins and coinHUD added 2022-08-28 20:15:40 -04:00
Chris Cromer 07520324cb
lower default volume 2022-08-28 01:54:45 -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 5ce3a2f37c
add blightwing prototype example 2022-08-04 00:59:48 -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 f9e70eae01
connect signals to the dreadteeth 2022-07-27 00:03:18 -04:00
Chris Cromer 332ac5b028
Merge branch 'develop' into feature/enemies 2022-07-23 13:07:55 -04:00
Chris Cromer 4f8c134bb7
add level 2 music 2022-07-22 00:10:08 -04:00
Chris Cromer 948f4ce911
add some enemy behavior prototypes 2022-07-21 00:05:08 -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
Martin Araneda 3a58777773 coin counter method created 2022-06-25 20:54:47 -04:00
Chris Cromer 9aafc64ba7
add enemies prototype level 2022-06-17 11:35:15 -04:00
Martin Araneda 876206c39d Added two states, collected and not collected 2022-06-11 00:26:11 -04:00
Martin Araneda a079d8aa37 changes to coin 2022-05-24 15:23:29 -04:00
Martin Araneda 57289dcb8f Coin added to prototype 2022-05-20 12:50:47 -04:00
Chris Cromer 4a64951f28
reimport levels with y sorting disabled 2022-04-23 15:48:25 -04:00
Chris Cromer 8edcae5adc
add camera limit script 2022-04-20 11:48:11 -04:00
Chris Cromer c88a8615b2
update level2 2022-04-19 23:48:49 -04:00
Chris Cromer cdaa32ce17
remove object layer 2022-04-16 16:03:41 -04:00
Chris Cromer a11370c784
update maps and tilesets 2022-04-16 14:21:15 -04:00
Chris Cromer a2ad48e900
prototype 2022-04-05 14:51:59 -04:00