Commit Graph

99 Commits

Author SHA1 Message Date
Max
865b5e0c52 animationspeed of rick edited 2021-07-01 11:39:33 +02:00
Max
d28a29df45 Spider anzahl fixed 2021-07-01 11:02:17 +02:00
Max
b85a36bf14 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-07-01 11:00:34 +02:00
Max
66d36c4ea2 Rick added 2021-07-01 11:00:27 +02:00
Tim
d46d25115e Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-07-01 10:58:44 +02:00
Tim
5f0b827fab better coin alignment 2021-07-01 10:58:42 +02:00
Tim
ca40e4c01a Coin collect animation 2021-07-01 10:47:37 +02:00
Max
21790ecd7a Create rick_sprite_sheet.png 2021-07-01 10:40:17 +02:00
Max
da5c5571b2 Rickroll added 2021-07-01 10:37:24 +02:00
Tim
af51d3776e door colors on maps 2021-07-01 10:23:46 +02:00
e818037d75 Coin Counter added 2021-07-01 08:41:45 +02:00
Malin.sieckmann
3e99a2ebc2 door textures finally added! WOOP WOOP 2021-06-30 19:05:06 +02:00
Malin.sieckmann
dc9a08c9ee Added DoorTiles Textures 2021-06-30 19:05:05 +02:00
Asecave
58a41725eb Snakes drop coins now 2021-06-30 19:01:57 +02:00
Asecave
d440ad8f67 Coins can be collected 2021-06-30 18:03:47 +02:00
Asecave
f386ef49f6 added coin entity 2021-06-30 17:14:43 +02:00
Asecave
3a65c74546 Show boundingbox info/debug with 'o' 2021-06-30 17:08:57 +02:00
Asecave
e643ec092d added class AnimatedEntity between LivingEntity and Entity 2021-06-30 17:06:29 +02:00
Asecave
c035253790 Entity vs Entity collision 2021-06-30 15:47:17 +02:00
a5eed792e7 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-30 13:33:45 +02:00
cbc30b0ac5 class Sounds and sounds with ids added 2021-06-30 13:33:22 +02:00
Max
d150a613c4 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-30 13:33:20 +02:00
Max
ec74176426 Disco sprite sheet added 2021-06-30 13:32:26 +02:00
Tim
28b9404fe9 added default texture 2021-06-30 13:32:05 +02:00
Asecave
b7da4535d7 new map structure 2021-06-29 15:37:26 +02:00
Asecave
f36c861726 player can take damage 2021-06-28 23:04:39 +02:00
0b521ca667 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 22:56:58 +02:00
1f1f5bbc68 Added special classes for Inventory and Herzen 2021-06-28 22:56:52 +02:00
Asecave
12c57e1c3c Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 22:28:04 +02:00
Asecave
52a59d2808 doors always lead to other rooms 2021-06-28 22:27:58 +02:00
Malin.sieckmann
657c7bab9e left door added/ improved, 3D wall added, shadow added 2021-06-28 21:45:51 +02:00
Asecave
23eba51e5c performance fix 2021-06-28 15:45:48 +02:00
Tim
1555acd781 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 09:49:41 +02:00
Tim
4f76c1eaa8 performace 2021-06-28 09:49:21 +02:00
08a67a8a24 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 09:38:20 +02:00
595b9b26d9 Shaking Hearts added 2021-06-28 09:37:25 +02:00
a0f632608a Merge remote-tracking branch 'origin/master' 2021-06-28 09:37:18 +02:00
fc17421e0b Inventory HUD Implementation 2021-06-28 09:37:08 +02:00
Tim
a6726b5e25 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 09:08:55 +02:00
Tim
88580aec12 Doors working 2021-06-28 09:08:51 +02:00
Malin.Sieckmann
9e6dca2a43 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-28 08:59:37 +02:00
Malin.Sieckmann
a0abdd8aa8 Adding inventar picture 1st test 2021-06-28 08:59:32 +02:00
0d2d9c8dbf Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda
# Conflicts:
#	Zoelda/src/main/items/Item.java
2021-06-28 08:30:54 +02:00
d6acbbec29 Items lil bit 2021-06-28 08:23:55 +02:00
74e82abbb0 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-27 23:04:04 +02:00
805ae2a960 New engine for displaying Hearts (Big Brain) 2021-06-27 23:03:55 +02:00
Asecave
e19165c6c8 WIP: doors 2021-06-27 22:26:51 +02:00
83120aef20 Merge branch 'master' of https://git.ngb.schule/Tim/Zoelda 2021-06-27 20:32:37 +02:00
8cdf1c22d4 Added new Prototype for Heart HUD 2021-06-27 20:29:00 +02:00
Asecave
71621b0110 fixed loader 2021-06-27 20:27:38 +02:00