creyD/ludum_dare_46
1
0
Fork 0
mirror of https://github.com/creyD/ludum_dare_46.git synced 2026-06-12 21:42:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
147 Commits 2 Branches 3 Tags
e2b618d47196c2c6341babebc7374c2cb977c157
Commit Graph

67 Commits

Author SHA1 Message Date
Paul Norberger
e2b618d471 Fixed debug label 2020-04-20 21:53:35 +02:00
panorb
ec785c5d75 Merge branch 'dev' into dev-boss-continuation 2020-04-20 21:49:48 +02:00
Paul Norberger
6e01f59bd6 Boss can die now 2020-04-20 21:46:16 +02:00
Paul Norberger
294fa5da9d Merge branch 'dev-boss-continuation' of https://github.com/creyD/ludum_dare_46 into dev-boss-continuation 2020-04-20 21:22:39 +02:00
Paul Norberger
0db9fe7636 Added the edges 2020-04-20 21:22:01 +02:00
Jan Schuffenhauer
8164b47301 Fixed StateBug 2020-04-20 21:09:13 +02:00
Conrad
5bfca83953 Merge branch 'dev' into dev-ai-tweaks 2020-04-20 21:07:33 +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
Conrad
c551a70b4d Stopped the background from playing on default 
This reduces our world default changes from 1 to 0
 2020-04-20 20:45:41 +02:00
Paul Norberger
b68689dfa0 Introduced bugs 2020-04-20 19:50:34 +02:00
Paul Norberger
400f18c37b Added more boss state machine 2020-04-20 18:17:54 +02:00
Paul Norberger
75a5130121 Progress on the boss 2020-04-20 17:52:21 +02:00
Paul Norberger
efacd63543 Fixed the random position move state 2020-04-20 14:39:51 +02:00
Jonas Mucke
d60f93db3e ai movement, ai hit and move treshhold added 2020-04-20 14:38:58 +02:00
Jonas Mucke
37ccf67677 merge fixes 2020-04-20 13:40:39 +02:00
Jonas Mucke
0d35d23447 Merge branch 'dev' into dev-ai 2020-04-20 13:32:24 +02:00
panorb
183f0e817a Merge branch 'dev' into dev-boss 2020-04-20 13:18:39 +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
28b08132e7 Tilemap is not a player! Fucking hell, check your collision layers mates 2020-04-20 01:15:31 +02:00
Conrad
1544bf6feb You can now play cards! 
- Fixed invalid scripts
- Added card placement validation

Co-Authored-By: deranonymos <deranonymos@users.noreply.github.com>
 2020-04-20 01:06:26 +02:00
Conrad
32ccb24012 Added Gameplay Animations and Functionality 
- Added clap animation for bear trap
- Added cards in menu bar
- Replaced old bear_trap icon with new one
 2020-04-20 00:19:06 +02:00
Jonas Mucke
fc59452928 torch, minion, ai attack 2020-04-20 00:04:25 +02:00
Paul Norberger
61dcd42dc6 Removed slimeboss script for now 2020-04-19 23:24:20 +02:00
Paul Norberger
331d32e2c0 Updated Word.tscn 2020-04-19 22:38:16 +02:00
Jonas Mucke
ceba6f648c cleanup 2020-04-19 21:45:48 +02:00
Conrad
95f37d9705 Merge branch 'bos_testing' into devRefactor 2020-04-19 21:29:28 +02:00
Jonas Mucke
5a21a715f5 ai_vasics_movement 2020-04-19 21:20:18 +02:00
Jonas Mucke
e21a065b60 sturr doggo 2020-04-19 20:31:14 +02:00
Jan Schuffenhauer
f470b57b71 Some Testing done and drop down fixed 2020-04-19 18:37:01 +02:00
Jan Schuffenhauer
1df204e987 Updated World for Testing 2020-04-19 18:29:19 +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
Jan Schuffenhauer
9799fdde04 Fireparticle added 2020-04-19 17:49:00 +02:00
Jonas Mucke
78af384563 basics of ai, ready for soundeffects 2020-04-19 17:41:57 +02:00
Jan Schuffenhauer
0fc4fbeab6 Now working Textbox 2020-04-19 17:08:16 +02:00
Streamfire
c412cfc8fd fixed DialogBoxScene to work properly when childed to container 2020-04-19 16:36:36 +02:00
Paul Norberger
291d4ce71b Fixed a few of the thousands of problems with the UI 2020-04-19 16:28:27 +02:00
Paul Norberger
7a24cfe6ff Merge branch 'devRefactor' of https://github.com/creyD/ludum_dare_46 into devRefactor 2020-04-19 16:08:11 +02:00
Paul Norberger
8ef83633fc Added dialogue system start point 2020-04-19 16:06:50 +02:00
Streamfire
bf29417785 DragDropUI added to world 2020-04-19 15:23:07 +02:00
Conrad
ac97b3b49e AI API Interface 2020-04-19 15:20:59 +02:00
Conrad
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