Commit Graph

173 Commits

Author SHA1 Message Date
Jan Schuffenhauer
2eadaeaf0a Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-20 23:24:58 +02:00
Jan Schuffenhauer
723b765b3e Implemented most sounds (Missing Boss and Hero Laught)) 2020-04-20 23:20:30 +02:00
Streamfire
11252d504e Buttttons 2020-04-20 23:20:11 +02:00
Paul Norberger
e682e5dc25 Removed old startup animation and added new asset 2020-04-20 22:49:04 +02:00
Jan Schuffenhauer
1299860e1f Mostly fixed 2020-04-20 22:26:45 +02:00
4175ff7bdd Merge pull request #10 from creyD/dev-gameplay
Added latest gameplay changes
2020-04-20 21:55:24 +02:00
1ec4d3ca93 Merge branch 'dev' into dev-gameplay 2020-04-20 21:55:15 +02:00
Paul Norberger
e2b618d471 Fixed debug label 2020-04-20 21:53:35 +02:00
074f9c31ca Merge branch 'dev' into dev-gameplay 2020-04-20 21:53:10 +02:00
f218b7f030 Merge branch 'dev' into dev-gameplay 2020-04-20 21:51:10 +02:00
panorb
ed4dfd0c67 Merge pull request #11 from creyD/dev-boss-continuation
Added latest boss changes
2020-04-20 21:49:59 +02:00
panorb
ec785c5d75 Merge branch 'dev' into dev-boss-continuation 2020-04-20 21:49:48 +02:00
Jan Schuffenhauer
3f5dbe5528 Fixed ot again 2020-04-20 21:47:42 +02:00
Paul Norberger
6e01f59bd6 Boss can die now 2020-04-20 21:46:16 +02:00
Streamfire
627e9b967a Merge branch 'dev-gameplay' of https://github.com/creyD/ludum_dare_46 into dev-gameplay 2020-04-20 21:41:00 +02:00
Streamfire
8e6dd6f5fe i tried 2020-04-20 21:40:56 +02:00
Jan Schuffenhauer
a759d0bcfb HOTFIX: Doesnt brake anymore 2020-04-20 21:38:29 +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
Mienek
9bca89ae1a not working cards 2020-04-20 21:20:24 +02:00
Jan Schuffenhauer
8164b47301 Fixed StateBug 2020-04-20 21:09:13 +02:00
94ac33a5af Merge pull request #9 from creyD/dev-ai-tweaks
Merged latest AI changes
2020-04-20 21:07:47 +02:00
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
75e8a0d188 Updated new icon 2020-04-20 21:00:25 +02:00
Jonas Mucke
e380a18ee3 finished player ai 2020-04-20 20:52:07 +02:00
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
a84331a702 Update README.md 2020-04-20 20:32:45 +02:00
Mienek
acc7f184c0 some work on roundoverscreen- HAS BUGS 2020-04-20 20:21:07 +02:00
Jan Schuffenhauer
14c4b147f8 Importet and Implementet Heart Icon 2020-04-20 19:51:55 +02:00
Paul Norberger
b68689dfa0 Introduced bugs 2020-04-20 19:50:34 +02:00
Jan Schuffenhauer
94badfb27a Added Ruby Sprites and Implemented them 2020-04-20 19:46:50 +02:00
Paul Norberger
0eea6edee7 Added stomp effect 2020-04-20 19:23:51 +02:00
Jan Schuffenhauer
ebad05009a added Fireknockback and added beartrap slowdown(not stun) 2020-04-20 19:17:08 +02:00
Streamfire
512fffee8d Merge branch 'dev-rounds' into dev-gameplay 2020-04-20 18:37:31 +02:00
Paul Norberger
400f18c37b Added more boss state machine 2020-04-20 18:17:54 +02:00
Jan Schuffenhauer
fd2ca0911e Added spike animation and added new WIP World layout 2020-04-20 18:11:16 +02:00
Paul Norberger
75a5130121 Progress on the boss 2020-04-20 17:52:21 +02:00
Streamfire
d0d5ded6f8 Added Wincondition and button to transition to winscreen, also changed spawnbehavior of new heroes 2020-04-20 16:51:57 +02:00
Mienek
336bc28dbd AI can hit 2020-04-20 16:11:37 +02:00
fafd1956c6 Added cards for objects + MISC
- Added flame animation
- Added cards for objects
- Added new background animation
- Added placeable walls

Co-Authored-By: deranonymos <deranonymos@users.noreply.github.com>
2020-04-20 15:54:40 +02:00
Paul Norberger
32e73895dc Changed up tileset 2020-04-20 14:56:51 +02:00
Streamfire
2fde998542 Turn System Working, Upgrade UI missing 2020-04-20 14:47:07 +02:00
Jonas Mucke
e2f50060db deleted h(x) and changed cost 2020-04-20 14:41:29 +02:00
0d20ff515d Added Barrier 2020-04-20 14:41:01 +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
d57645e5a2 Merge pull request #7 from creyD/dev-ai
Neue AI Änderungen
2020-04-20 13:34:39 +02:00
Jonas Mucke
0d35d23447 Merge branch 'dev' into dev-ai 2020-04-20 13:32:24 +02:00