Commit Graph

60 Commits

Author SHA1 Message Date
00a4a54bea Merge remote-tracking branch 'origin/levelz999' 2020-08-20 16:23:18 +02:00
Aquarelle
2e7c81f51d more changes 2020-08-20 16:22:19 +02:00
6ce7d1ef92 Main title music, in game flatfish control indicator, tileset update, remove start tiles 2020-08-20 16:20:33 +02:00
800de8be5c Merge remote-tracking branch 'origin/levelz2' 2020-08-20 15:35:08 +02:00
0ada95d2da main_menu: add default background 2020-08-20 15:32:23 +02:00
255eb17958 Add ely expressions 2020-08-20 15:29:15 +02:00
631be01a8b game1: update opening mask 2020-08-20 15:21:44 +02:00
e76e3b73b9 game1: add opening text, mask, dialogue 2020-08-20 15:18:39 +02:00
f612d17301 Add control indicators (tips) 2020-08-20 14:45:54 +02:00
ae4fe3a7bc Fix oil_tanker crabnimation 2020-08-20 13:32:03 +02:00
54d97ba580 Add oil_tanker updated art 2020-08-20 13:27:52 +02:00
30aaea64c6 Add updated pixel art 2020-08-20 13:21:04 +02:00
533f41fedf Add fadein and fadeout to dialogues and other improvements 2020-08-20 13:08:00 +02:00
29dcc1630c oil_tanker: add dialogues 2020-08-20 12:01:19 +02:00
46e6815abc More dialogue improvements 2020-08-20 11:58:29 +02:00
d0e6d0d204 A Crab becomes Herbert at some point 2020-08-20 10:46:00 +02:00
871981a7d5 Minor dialogue corrections 2020-08-20 10:42:52 +02:00
a2869c720f Progress towards the end of the game 2020-08-20 10:35:25 +02:00
efc5806d0a Add oil_tanker 3rd part 2020-08-19 18:59:29 +02:00
8b1f73b3be dialogues update
Co-authored-by: AquarelleOuate <aquarelleouate@gmail.com>
2020-08-19 17:23:59 +02:00
728fbc6990 game1: replace goo with new goo emitter and go to next scene at end 2020-08-19 17:04:26 +02:00
0ddfa9d866 oil_tanker: add new GooParticle emitter 2020-08-19 16:57:52 +02:00
45019768d5 Add oil tanker scene 2020-08-19 13:56:34 +02:00
Aquarelle
393b06a44a game1: fix out of bounds and z-level errors 2020-08-19 13:36:57 +02:00
8798cb17b0 game1: add debug utils to skip to specific levels 2020-08-19 13:01:47 +02:00
4f2068729a Remove debug start_game 2020-08-19 12:11:14 +02:00
2b83f715f1 Fix levels 2020-08-19 12:10:25 +02:00
f2918cab11 Add LogEntity 2020-08-19 11:56:10 +02:00
370b2e5925 Fix spawn_point offset 2020-08-18 21:22:14 +02:00
3b1af3754d game1: make start and finish work and fix collisions 2020-08-18 21:15:10 +02:00
4493cecedc Merge remote-tracking branch 'origin/levelz' 2020-08-18 19:32:11 +02:00
Aquarelle
75c9963431 add more levels and update tileset 2020-08-18 19:19:05 +02:00
b0762ec3db game1: add terrain collision detection 2020-08-18 18:49:16 +02:00
862907f15b game1: make flat fishes work 2020-08-18 17:45:22 +02:00
d58119d498 game1: add entity system, dynamic player spawn, multi-level preparation 2020-08-18 16:55:40 +02:00
c42e060a2b Merge branch 'level1' into 'master'
add level1

See merge request ArisuOngaku/crabs-game!1
2020-08-18 13:25:59 +00:00
Aquarelle
8fb4f7360b add level1 2020-08-18 15:21:23 +02:00
0841228513 game1 opening2: add goo 2020-08-18 15:13:54 +02:00
Aquarelle
cecdbd7946 add level1 2020-08-18 14:58:20 +02:00
f24941db1b Load game1 scene after campfire dialog 2020-08-18 12:02:53 +02:00
1d0f1bae80 Tweak default music fade duration 2020-08-18 12:02:14 +02:00
28b6d0fc7c Make a MusicPlayer singleton to manage music and add music fade out 2020-08-18 11:55:07 +02:00
4636b3aefc Add sounds to intro scene 2020-08-18 11:05:27 +02:00
bcb80dbec9 game1: update tileset and add "Background" layer 2020-08-17 19:55:24 +02:00
ec7314eb91 game1: add player and tilemap 2020-08-17 17:27:28 +02:00
b2471a0592 game1: add second opening scene with player controls 2020-08-17 14:37:07 +02:00
2f06eb7f8b Game1 basics 2020-08-17 12:15:41 +02:00
d20ecf9843 Reorganize images 2020-08-17 11:51:44 +02:00
47944509f7 main menu: fix animations start times 2020-08-17 11:38:42 +02:00
79e7954b50 Add cinematic tools to the dialogue system 2020-08-17 11:37:57 +02:00