Commit Graph

200 Commits

Author SHA1 Message Date
ac061cdd39 Merge pull request #13 from creyD/dev-music
Added MISC Features
2020-04-21 01:11:29 +02:00
Paul Norberger
dd120b9c2a Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-21 01:09:36 +02:00
391bd9bcf8 Merge branch 'dev' into dev-music 2020-04-21 01:09:00 +02:00
cbb4a61ea2 Merge pull request #12 from creyD/dev-gameplay
Added Gameplay Features
2020-04-21 01:07:07 +02:00
Paul Norberger
e27933dba5 Include lose screen logic 2020-04-21 01:06:39 +02:00
1df4dea323 Added slime card
- Added slime card
- Removed test debug
2020-04-21 01:05:57 +02:00
Paul Norberger
840641ab85 Added a win screen 2020-04-21 01:02:26 +02:00
Paul Norberger
126c4245dd Fixed sound looping 2020-04-21 00:58:12 +02:00
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
Mienek
0d0dc5dbea cards work well 2020-04-21 00:37:13 +02:00
Paul Norberger
ed320ecc7f Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-21 00:07:00 +02:00
Paul Norberger
af24763fe5 Adjusted spawn range once again 2020-04-21 00:06:40 +02:00
Jan Schuffenhauer
a14172538b added Credits Music 2020-04-21 00:05:59 +02:00
Paul Norberger
b1e139b740 Fixed spawn point determination 2020-04-20 23:56:12 +02:00
5f8e91bc13 Temp card fix 2020-04-20 23:50:29 +02:00
Paul Norberger
a52d7f8106 Fixed a bit of menu shit 2020-04-20 23:45:13 +02:00
Paul Norberger
a88861111a Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-20 23:34:18 +02:00
Paul Norberger
8c83e2f3e9 Adapted titlescreen to new animation 2020-04-20 23:33:11 +02:00
Streamfire
b52c804c2e stizzle mit dem fire stuff 2020-04-20 23:32:28 +02:00
055302b1a8 Added first test version 2020-04-20 23:27:44 +02:00
Jan Schuffenhauer
7ef527fb83 Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-20 23:26:07 +02:00
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
Paul Norberger
e9341d42b9 Merge branch 'dev-music' of https://github.com/creyD/ludum_dare_46 into dev-music 2020-04-20 23:24:46 +02:00
Paul Norberger
84e5a9080f Changed up startup animation 2020-04-20 23:24:42 +02:00
908b71e30e Stopped background animation 2020-04-20 23:24:09 +02:00
Mienek
5d264f4457 only cards are shown 2020-04-20 23:21:39 +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