|
|
3a2caecfff
|
working on buy buttons
|
2021-04-25 11:09:38 -04:00 |
|
rsninja722
|
a4f2ee84d4
|
shop background + tile map editor
|
2021-04-25 10:49:39 -04:00 |
|
rsninja722
|
9035b1d872
|
Merge branch 'master' into assets
|
2021-04-25 10:47:20 -04:00 |
|
|
|
010ad7ce26
|
move shop file
|
2021-04-25 10:42:03 -04:00 |
|
|
|
fa7040f626
|
Shop screen layout
|
2021-04-25 10:38:41 -04:00 |
|
|
|
eff489d9ff
|
Adding UI boxes
|
2021-04-25 10:33:11 -04:00 |
|
|
|
83aaa01133
|
button
|
2021-04-25 10:18:23 -04:00 |
|
|
|
1bc5aa966d
|
improved menu navigation
|
2021-04-25 10:05:35 -04:00 |
|
|
|
bed3f407d6
|
tmp disable shop code
|
2021-04-25 10:01:02 -04:00 |
|
|
|
2a24d45cce
|
Pull in shop logic
Co-authored-by: wm-c <wcmeathrel@gmail.com>
|
2021-04-25 09:58:43 -04:00 |
|
|
|
a68d3e8e70
|
lvl3 flippers
Co-authored-by: wm-c <wcmeathrel@gmail.com>
|
2021-04-25 09:54:23 -04:00 |
|
|
|
6c288e9178
|
Add flashlight
Co-authored-by: wm-c <wcmeathrel@gmail.com>
|
2021-04-25 09:53:56 -04:00 |
|
|
|
73ac4d25a9
|
lvl3 stun gun
Co-authored-by: wm-c <wcmeathrel@gmail.com>
|
2021-04-25 09:53:24 -04:00 |
|
|
|
c4dd17f25d
|
Add airbag item data
Co-authored-by: wm-c <wcmeathrel@gmail.com>
|
2021-04-25 09:52:15 -04:00 |
|
|
|
7452803ba9
|
Create a base screen for the shop
|
2021-04-25 09:49:16 -04:00 |
|
|
|
43c60c6dfc
|
Merge pull request #26 from Ewpratten/darkness
Make the world dark, using an image now!
|
2021-04-25 09:34:27 -04:00 |
|
|
|
8b15d8fcaf
|
Better darkness logic
|
2021-04-25 09:33:32 -04:00 |
|
|
|
f67b654088
|
proper background rendering with scale
|
2021-04-25 09:23:31 -04:00 |
|
|
|
0c4928b892
|
dark png
|
2021-04-24 21:45:54 -04:00 |
|
|
|
dcbe3eab2e
|
Merge pull request #22 from Ewpratten/darkness
darkness is taking over
|
2021-04-24 21:16:14 -04:00 |
|
|
|
43bcfe8623
|
darkness is taking over
|
2021-04-24 21:15:57 -04:00 |
|
|
|
d972238574
|
Main menu button fixes
|
2021-04-24 20:49:35 -04:00 |
|
|
|
ff36b1c2c3
|
Merge pull request #21 from Ewpratten/octopus
Octopus logic
|
2021-04-24 20:35:34 -04:00 |
|
|
|
3d29a971cf
|
octobreath
|
2021-04-24 20:33:28 -04:00 |
|
|
|
c5a2877efd
|
suck air bubble animation
|
2021-04-24 20:07:19 -04:00 |
|
|
|
cf342aa932
|
octopus movement
|
2021-04-24 19:39:09 -04:00 |
|
|
|
1585521fe3
|
background gradient
|
2021-04-24 19:09:28 -04:00 |
|
|
|
561bb5abf5
|
Merge pull request #20 from Ewpratten/ouchies
Add jellyfish as an enemy
|
2021-04-24 19:03:58 -04:00 |
|
|
|
81126975a1
|
fix fish render layer
|
2021-04-24 19:02:03 -04:00 |
|
|
|
f9957f57ea
|
reverse stun animation
|
2021-04-24 18:58:20 -04:00 |
|
|
|
54ff1c7931
|
finished stun system
|
2021-04-24 18:54:23 -04:00 |
|
|
|
0659780b3d
|
load stunned animation
|
2021-04-24 18:46:13 -04:00 |
|
|
|
9148235383
|
jelly can stun player
|
2021-04-24 18:45:13 -04:00 |
|
|
|
99e7e02d0c
|
Better AOE animation
|
2021-04-24 18:32:08 -04:00 |
|
|
|
9493baedf5
|
stun the jellyfish
|
2021-04-24 18:28:27 -04:00 |
|
|
|
e8317e0619
|
Merge remote-tracking branch 'origin/movement_tweaks' into ouchies
|
2021-04-24 18:11:45 -04:00 |
|
|
|
09b2752d78
|
stun check
|
2021-04-24 18:10:27 -04:00 |
|
rsninja722
|
e7ac70074c
|
no more stuck
|
2021-04-24 17:33:53 -04:00 |
|
|
|
707543cf55
|
jelly
|
2021-04-24 17:26:47 -04:00 |
|
|
|
fd8385eec1
|
Merge remote-tracking branch 'origin/assets' into ouchies
|
2021-04-24 17:16:16 -04:00 |
|
|
|
9e0a8df259
|
jelly movement
|
2021-04-24 17:15:28 -04:00 |
|
|
|
0aef4804fd
|
jelly animation
|
2021-04-24 17:12:40 -04:00 |
|
rsninja722
|
a453d16d1d
|
jelly enemy
|
2021-04-24 17:08:17 -04:00 |
|
rsninja722
|
43c383ed70
|
Merge branch 'master' into assets
|
2021-04-24 17:07:51 -04:00 |
|
|
|
c0d147681b
|
handle attacking the jellyfish
|
2021-04-24 17:06:13 -04:00 |
|
|
|
a3d79a5ebc
|
jellyfish rendering
|
2021-04-24 17:02:37 -04:00 |
|
|
|
296d5fff8f
|
checking for stun gun use
|
2021-04-24 16:48:16 -04:00 |
|
|
|
8db5ff65ec
|
flipper logic
|
2021-04-24 16:46:06 -04:00 |
|
|
|
43eab974b0
|
fix access
|
2021-04-24 16:39:36 -04:00 |
|
|
|
8c142d2711
|
Rewrite the inventory
|
2021-04-24 16:37:58 -04:00 |
|
