Commit Graph

53 Commits

Author SHA1 Message Date
Streamfire
2fde998542 Turn System Working, Upgrade UI missing 2020-04-20 14:47:07 +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
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
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
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
ac97b3b49e AI API Interface 2020-04-19 15:20:59 +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
Jonas Mucke
13bdabe156 aStar implementation with todos 2020-04-19 10:18:22 +02:00
Paul Norberger
d71b728e94 First changes 2020-04-19 08:53:49 +02:00
Jonas Mucke
3dc9b88237 basiscs of ai 2020-04-18 23:43:10 +02:00
Jonas Mucke
e7d5d9eacc setup for ai 2020-04-18 21:17:13 +02:00
Jonas Mucke
b75cdf7a76 added barrel drops 2020-04-18 19:44:13 +02:00
Jonas Mucke
f111f75133 fixed script bugs 2020-04-18 19:09:22 +02:00
Jan Schuffenhauer
dd01067dac Traps updated, Live and Collactables added 2020-04-18 18:56:05 +02:00
Jan Schuffenhauer
b0a35659d9 Merge branch 'devMechanics' into devPlayerStats 2020-04-18 17:16:52 +02:00
Jan Schuffenhauer
dd870a1aa9 Merge branch 'devMechanics' into devPlayerStats 2020-04-18 16:29:11 +02:00
Paul Norberger
4d696c0cea Added basic title screen functionality 2020-04-18 14:21:22 +02:00
Paul Norberger
e9e5533d52 Fixed startup starting frame 2020-04-18 02:25:19 +02:00
Paul Norberger
63b38a1293 Moved and refactored startup 2020-04-18 02:17:15 +02:00