|
|
10949850f6
|
Merge pull request #32 from Ewpratten/assets
Assets
|
2021-04-25 13:48:34 -04:00 |
|
|
|
c91d82080a
|
Merge pull request #33 from Ewpratten/backgrounds
add backgrounds to menus
|
2021-04-25 13:48:17 -04:00 |
|
|
|
319405e761
|
add backgrounds to menus
|
2021-04-25 13:48:00 -04:00 |
|
rsninja722
|
3b9eebbb3c
|
fish fix, less js
|
2021-04-25 13:45:50 -04:00 |
|
|
|
2f1a275465
|
Merge pull request #31 from Ewpratten/outofbreathscreen
Death screen added
|
2021-04-25 13:43:55 -04:00 |
|
|
|
846b75d6e5
|
Merge remote-tracking branch 'origin/master' into outofbreathscreen
|
2021-04-25 13:43:35 -04:00 |
|
wm-c
|
fcaeee4877
|
Death screen added
|
2021-04-25 13:37:23 -04:00 |
|
rsninja722
|
c5f716cca1
|
Merge branch 'master' into assets
|
2021-04-25 13:36:58 -04:00 |
|
|
|
c207966b75
|
Merge pull request #30 from Ewpratten/fish_fix
Fish fix
|
2021-04-25 13:34:29 -04:00 |
|
|
|
50baf53b9e
|
fix fish direction
|
2021-04-25 13:33:10 -04:00 |
|
|
|
e7cd020666
|
Merge remote-tracking branch 'origin/assets' into fish_fix
|
2021-04-25 13:30:17 -04:00 |
|
|
|
c4fec8c835
|
Merge remote-tracking branch 'origin/master' into fish_fix
|
2021-04-25 13:29:29 -04:00 |
|
|
|
021e597747
|
Merge pull request #29 from Ewpratten/item_impl
Implement items
|
2021-04-25 13:28:59 -04:00 |
|
rsninja722
|
67d76dab08
|
fish??
|
2021-04-25 13:28:37 -04:00 |
|
|
|
2d6d1f3629
|
air bag impl
|
2021-04-25 13:28:34 -04:00 |
|
|
|
da3b52e395
|
Add flipper logic
|
2021-04-25 13:25:05 -04:00 |
|
|
|
97449cbc44
|
Merge pull request #28 from Ewpratten/shop_tooltip
tooltips in the shop
|
2021-04-25 13:20:19 -04:00 |
|
rsninja722
|
b1a1b2e105
|
fish?
|
2021-04-25 13:15:06 -04:00 |
|
|
|
53b3a33b4e
|
Store tooltips
|
2021-04-25 13:15:05 -04:00 |
|
|
|
1abc80be64
|
placeholder item rendering
|
2021-04-25 13:06:48 -04:00 |
|
|
|
5d019bf39f
|
Merge pull request #27 from Ewpratten/shop2
Merge shop code with master, while doing a bunch of UI updates
|
2021-04-25 12:45:06 -04:00 |
|
|
|
cc4affdbd1
|
remove player extra coins
|
2021-04-25 12:39:53 -04:00 |
|
|
|
7979295f7a
|
Add world resetting and state saving
|
2021-04-25 12:39:10 -04:00 |
|
|
|
7dac0bbfd1
|
user can now buy items!
|
2021-04-25 12:23:46 -04:00 |
|
|
|
a88cae2875
|
buy button
|
2021-04-25 11:55:35 -04:00 |
|
|
|
82d5b336c6
|
Full game navigation
|
2021-04-25 11:51:38 -04:00 |
|
|
|
289befc802
|
much improved item buy button rendering
|
2021-04-25 11:45:54 -04:00 |
|
|
|
5bb8261119
|
Item wrapper
|
2021-04-25 11:37:53 -04:00 |
|
|
|
0d862760bd
|
item trait
|
2021-04-25 11:26:25 -04:00 |
|
|
|
198edc6556
|
more items
|
2021-04-25 11:17:48 -04:00 |
|
|
|
ad5d6bc1ab
|
background image
|
2021-04-25 11:12:37 -04:00 |
|
|
|
560329fa2b
|
Merge remote-tracking branch 'origin/assets' into shop2
|
2021-04-25 11:10:01 -04:00 |
|
|
|
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 |
|
