Commit Graph

56 Commits

Author SHA1 Message Date
Paul Norberger
79ee834f7e Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-21 00:53:48 +02:00
Paul Norberger
260e0bae42 Added lose screen and updated player 2020-04-21 00:53:33 +02:00
Jan Schuffenhauer
de9a94255f Sounds partially added 2020-04-21 00:51:42 +02:00
Jan Schuffenhauer
723b765b3e Implemented most sounds (Missing Boss and Hero Laught)) 2020-04-20 23:20:30 +02:00
Jan Schuffenhauer
1299860e1f Mostly fixed 2020-04-20 22:26:45 +02:00
f218b7f030 Merge branch 'dev' into dev-gameplay 2020-04-20 21:51:10 +02:00
Jonas Mucke
ce1429693a player and minion ai finished 2020-04-20 21:05:40 +02:00
Jonas Mucke
e380a18ee3 finished player ai 2020-04-20 20:52:07 +02:00
Streamfire
512fffee8d Merge branch 'dev-rounds' into dev-gameplay 2020-04-20 18:37:31 +02:00
Jan Schuffenhauer
fd2ca0911e Added spike animation and added new WIP World layout 2020-04-20 18:11:16 +02:00
Streamfire
2fde998542 Turn System Working, Upgrade UI missing 2020-04-20 14:47:07 +02:00
Jonas Mucke
d60f93db3e ai movement, ai hit and move treshhold added 2020-04-20 14:38:58 +02:00
Jonas Mucke
0d35d23447 Merge branch 'dev' into dev-ai 2020-04-20 13:32:24 +02:00
Jonas Mucke
3ec908f6c3 ai adaptation 2020-04-20 13:15:24 +02:00
Paul Norberger
2406e08f90 Added beginnings of boss 2020-04-20 13:13:54 +02:00
Jonas Mucke
b8b026d063 ai fixed 2020-04-20 10:09:07 +02:00
Paul Norberger
53b4dbb92a Changed default of heal particle effect to emitting=false 2020-04-20 01:44:20 +02:00
Paul Norberger
0daf9090eb Added appropriate groups and checked for hitbox-likeness 2020-04-20 01:12:15 +02:00
Jonas Mucke
fc59452928 torch, minion, ai attack 2020-04-20 00:04:25 +02:00
38c5caa868 Minor Code Cleanup 2020-04-19 21:58:01 +02:00
Jonas Mucke
7b1d57dfb5 swicth animation to change scene 2020-04-19 21:51:38 +02:00
Jonas Mucke
ceba6f648c cleanup 2020-04-19 21:45:48 +02:00
95f37d9705 Merge branch 'bos_testing' into devRefactor 2020-04-19 21:29:28 +02:00
Jonas Mucke
e21a065b60 sturr doggo 2020-04-19 20:31:14 +02:00
Jan Schuffenhauer
bc37f6c010 Merge branch 'bos_testing' into devRefactor 2020-04-19 18:30:31 +02:00
Jonas Mucke
1a58a9689e fixed placer movement 2020-04-19 18:27:48 +02:00
Jan Schuffenhauer
19dcf6e135 Merge branch 'bos_testing' into devRefactor 2020-04-19 18:26:34 +02:00
Jonas Mucke
dd227744ac fixed no target bug 2020-04-19 18:23:50 +02:00
Jan Schuffenhauer
92b97972bf Buug Fixes
Maybe Destroyed on last merge
2020-04-19 18:07:34 +02:00
Jan Schuffenhauer
f94e474228 Merge branch 'bos_testing' into devRefactor 2020-04-19 18:01:14 +02:00
Jonas Mucke
78af384563 basics of ai, ready for soundeffects 2020-04-19 17:41:57 +02:00
ac97b3b49e AI API Interface 2020-04-19 15:20:59 +02:00
Streamfire
f545fac18b imports 2020-04-19 14:47:45 +02:00
Streamfire
ea133d74a1 sword sounds 2020-04-19 14:44:34 +02:00
Streamfire
cfe32946d4 Hero Laugh sounds 2020-04-19 14:36:53 +02:00
1c2bb67246 Added Interface for AI control 2020-04-19 14:25:15 +02:00
Paul Norberger
9df42a3245 Fixed healing gfx effect 2020-04-19 14:20:35 +02:00
Jan Schuffenhauer
e0e6662309 Added Grid, and Kind describtion 2020-04-19 13:44:25 +02:00
Paul Norberger
8af0bebad4 Fixed a few file name casing inconsistencies 2020-04-19 13:25:30 +02:00
Paul Norberger
cf687af835 Merge branch 'devEffects' into devRefactor 2020-04-19 13:13:03 +02:00
Streamfire
9b72400839 Player Sound refactored
soundplayback moved to states
2020-04-19 12:40:19 +02:00
Streamfire
48a6fe1bd1 Merge remote-tracking branch 'origin/dev-sounds' into devRefactor 2020-04-19 11:42:54 +02:00
Paul Norberger
917aff815a Start of animation player state mashine 2020-04-19 10:19:32 +02:00
Paul Norberger
d71b728e94 First changes 2020-04-19 08:53:49 +02:00
Paul Norberger
5e4b93fb36 Heal and Fire Particle Basis added 2020-04-18 23:52:28 +02:00
Jonas Mucke
3dc9b88237 basiscs of ai 2020-04-18 23:43:10 +02:00
Paul Norberger
bce8d50a93 Improved hero walking sounds 2020-04-18 22:27:08 +02:00
Jonas Mucke
e7d5d9eacc setup for ai 2020-04-18 21:17:13 +02:00
4564dbdab4 Added walk sounds for the player 2020-04-18 20:11:00 +02:00
Jonas Mucke
f111f75133 fixed script bugs 2020-04-18 19:09:22 +02:00