Compare commits

merge into: oat:master

Branches Tags

oat:main

oat:master

...

pull from: oat:main

Branches Tags

oat:main

oat:master

25 commits

master ... main

Author	SHA1	Message	Date
jill	d614114baf	upscaled sprites, some readjustments	2021-03-27 19:48:01 +03:00
jill	5c7ce2620d	lurker, temp options	2021-02-09 21:06:08 +03:00
jill	738398fc2b	dynamic sprite loading	2021-01-26 00:17:32 +03:00
jill	c575497b3f	unhardcore mobile res	2021-01-25 23:31:30 +03:00
jill	52ee57f231	experimental mobile support (maybe!!)	2021-01-25 22:58:16 +03:00
jill	18d9d681b8	fixes	2021-01-25 21:45:06 +03:00
jill	057e9d3d41	wip pause screen	2021-01-25 21:34:38 +03:00
jill	e764082a80	fixes	2021-01-25 21:06:32 +03:00
jill	0cf9e962b6	star fish	2021-01-25 21:05:06 +03:00
jill	00f4f5a30b	more cursor stuff	2021-01-25 19:42:27 +03:00
jill	c4d1846765	cursors	2021-01-25 18:17:32 +03:00
jill	101ba11709	fixes	2021-01-25 17:57:53 +03:00
jill	57fa26dfb7	carnivore	2021-01-25 17:48:31 +03:00
jill	3b70bf9b5d	fix for the fake pill upgrade	2021-01-25 09:20:23 +03:00
jill	3a1183cdd7	post-refactor fixes	2021-01-24 20:46:52 +03:00
jill	5fbf569c65	3am refactoring lets go	2021-01-24 02:30:01 +03:00
jill	e2703105dd	a proper money system and progressive upgrades ... the game is now officially playable! this marks 1.0b and perfectly recreates the "tutorial" stage of insaniquarium, with some audio and visual changes, no king guppies and no egg pieces	2021-01-23 23:04:16 +03:00
jill	74bf2a7045	money	2021-01-23 22:42:56 +03:00
jill	f61d3383d4	constant updates	2021-01-23 19:42:33 +03:00
jill	a22b6d1e22	sounds	2021-01-23 19:37:37 +03:00
jill	737ae2efe0	more button functionality	2021-01-23 17:22:14 +03:00
jill	0f0d092339	cleanup	2021-01-23 16:47:28 +03:00
jill	bcfd75c270	footer progress	2021-01-23 16:46:02 +03:00
jill	6ecbf07dbf	they die	2021-01-23 13:10:38 +03:00
jill	61d28a326f	replace fishgoals with proper food look system	2021-01-23 12:49:35 +03:00

124 changed files with 2426 additions and 442 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Expand all files Collapse all files

BIN

assets/audio/sfx/buttonclick.ogg Normal file

View file

Binary file not shown.

BIN

assets/audio/sfx/buzzer.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/chomp.ogg Normal file

View file

Binary file not shown.

BIN

assets/audio/sfx/collect.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/die.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/dropfood.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/explode.ogg Normal file

View file

Binary file not shown.

BIN

assets/audio/sfx/grow.ogg Normal file

View file

Binary file not shown.

BIN

assets/audio/sfx/slurp.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/splash.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/splashbig.ogg Executable file

View file

Binary file not shown.

BIN

assets/audio/sfx/tapglass.ogg Normal file

View file

Binary file not shown.

BIN

assets/fonts/cont.ttf Normal file

View file

Binary file not shown.

BIN

assets/fonts/pix.ttf Normal file

View file

Binary file not shown.

BIN

assets/sprites/bg/1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 500 KiB After Width:  |  Height:  |  Size: 1.4 MiB

BIN

assets/sprites/cursor/dragging.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

assets/sprites/cursor/hand.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

assets/sprites/cursor/pointer.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

assets/sprites/fish/big_die.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 34 KiB After Width:  |  Height:  |  Size: 188 KiB

BIN

assets/sprites/fish/big_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 161 KiB

BIN

assets/sprites/fish/big_hungry_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 168 KiB

BIN

assets/sprites/fish/big_hungry_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 180 KiB

BIN

assets/sprites/fish/big_hungry_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 33 KiB After Width:  |  Height:  |  Size: 190 KiB

BIN

assets/sprites/fish/big_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 176 KiB

BIN

assets/sprites/fish/big_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 191 KiB

BIN

assets/sprites/fish/biig_die.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 28 KiB

BIN

assets/sprites/fish/biig_eat.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 17 KiB

BIN

assets/sprites/fish/biig_hungry_eat.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 24 KiB

BIN

assets/sprites/fish/biig_hungry_swim.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 24 KiB

BIN

assets/sprites/fish/biig_hungry_turn.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 30 KiB

BIN

assets/sprites/fish/biig_swim.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 17 KiB

BIN

assets/sprites/fish/biig_turn.png

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 21 KiB

BIN

assets/sprites/fish/carnivore_die.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 184 KiB

BIN

assets/sprites/fish/carnivore_eat.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 188 KiB

BIN

assets/sprites/fish/carnivore_hungry_eat.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 182 KiB

BIN

assets/sprites/fish/carnivore_hungry_swim.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 177 KiB

BIN

assets/sprites/fish/carnivore_hungry_turn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 185 KiB

BIN

assets/sprites/fish/carnivore_swim.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 186 KiB

BIN

assets/sprites/fish/carnivore_turn.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 196 KiB

BIN

assets/sprites/fish/king_die.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 39 KiB After Width:  |  Height:  |  Size: 217 KiB

BIN

assets/sprites/fish/king_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 187 KiB

BIN

assets/sprites/fish/king_hungry_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 188 KiB

BIN

assets/sprites/fish/king_hungry_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 204 KiB

BIN

assets/sprites/fish/king_hungry_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 38 KiB After Width:  |  Height:  |  Size: 217 KiB

BIN

assets/sprites/fish/king_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 194 KiB

BIN

assets/sprites/fish/king_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 220 KiB

BIN

assets/sprites/fish/medium_die.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 133 KiB

BIN

assets/sprites/fish/medium_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 115 KiB

BIN

assets/sprites/fish/medium_hungry_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 117 KiB

BIN

assets/sprites/fish/medium_hungry_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 129 KiB

BIN

assets/sprites/fish/medium_hungry_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 133 KiB

BIN

assets/sprites/fish/medium_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 124 KiB

BIN

assets/sprites/fish/medium_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 132 KiB

BIN

assets/sprites/fish/small_die.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 82 KiB

BIN

assets/sprites/fish/small_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 70 KiB

BIN

assets/sprites/fish/small_hungry_eat.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 70 KiB

BIN

assets/sprites/fish/small_hungry_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/sprites/fish/small_hungry_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/sprites/fish/small_swim.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 76 KiB

BIN

assets/sprites/fish/small_turn.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 78 KiB

BIN

assets/sprites/food/1.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/sprites/food/2.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.7 KiB After Width:  |  Height:  |  Size: 29 KiB

BIN

assets/sprites/food/3.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

assets/sprites/food/potion.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 9.3 KiB After Width:  |  Height:  |  Size: 77 KiB

BIN

assets/sprites/food/what.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 4.3 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

assets/sprites/footer/gif/HatchANIMATION.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 4.2 KiB

BIN

assets/sprites/footer/gif/LazerGunz.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 6 KiB

BIN

assets/sprites/footer/gif/OPTIONSBUTTON.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/sprites/footer/gif/OPTIONSBUTTONd.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/sprites/footer/gif/_HatchANIMATION.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

assets/sprites/footer/gif/_LazerGunz.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.9 KiB

BIN

assets/sprites/footer/gif/_MBREFLECTION.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/sprites/footer/gif/_OPTIONSBUTTON.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 222 B

BIN

assets/sprites/footer/gif/_OPTIONSBUTTONd.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 222 B

BIN

assets/sprites/footer/gif/_mbuttond.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 411 B

BIN

assets/sprites/footer/gif/_mbuttono.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 430 B

BIN

assets/sprites/footer/gif/_mbuttonu.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 434 B

BIN

assets/sprites/footer/gif/_menubar.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 628 B

BIN

assets/sprites/footer/gif/mbuttond.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.5 KiB

BIN

assets/sprites/footer/gif/mbuttond.gif-autosave.kra

View file

Binary file not shown.

BIN

assets/sprites/footer/gif/mbuttono.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

assets/sprites/footer/gif/mbuttono.gif-autosave.kra

View file

Binary file not shown.

BIN

assets/sprites/footer/gif/mbuttonu.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 1.4 KiB

BIN

assets/sprites/footer/gif/mbuttonu.gif-autosave.kra

View file

Binary file not shown.

BIN

assets/sprites/footer/gif/menubar.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 17 KiB

BIN

assets/sprites/footer/gif/menubar.gif-autosave.kra

View file

Binary file not shown.

BIN

assets/sprites/footer/gif/moneyflash.gif

View file

Binary file not shown.

Side by side Before Width:  |  Height:  |  Size: 311 B

0

assets/sprites/footer/base.png → assets/sprites/header/base.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 19 KiB

BIN

assets/sprites/header/button_open.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 8.6 KiB

0

assets/sprites/footer/buttonbg.png → assets/sprites/header/buttonbg.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

0

assets/sprites/footer/buttonbg_down.png → assets/sprites/header/buttonbg_down.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.3 KiB After Width:  |  Height:  |  Size: 3.3 KiB

0

assets/sprites/footer/buttonbg_hover.png → assets/sprites/header/buttonbg_hover.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 3.1 KiB After Width:  |  Height:  |  Size: 3.1 KiB

BIN

assets/sprites/header/moneyflash.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 807 B

BIN

assets/sprites/header/optionsbutton_down.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.5 KiB

BIN

assets/sprites/header/optionsbutton_hover.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 2.4 KiB

0

assets/sprites/footer/reflection.png → assets/sprites/header/reflection.png

Unescape Escape View file

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 1.1 KiB

BIN

assets/sprites/money/beetle.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 80 KiB

BIN

assets/sprites/money/chest.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 149 KiB

BIN

assets/sprites/money/coin1.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 60 KiB

BIN

assets/sprites/money/coin2.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 64 KiB

Some files were not shown because too many files have changed in this diff Show more