224 Commits

Author SHA1 Message Date
4f8f03a3dc
Merge pull request #48 from Ewpratten/rsninja/fixes
Rsninja/fixes
2022-04-04 00:50:26 -04:00
rsninja722
b72051ebbe Merge remote-tracking branch 'origin/master' into rsninja/fixes 2022-04-04 00:47:25 -04:00
rsninja722
14d8a73c02 fixes 2022-04-04 00:47:18 -04:00
c44b9191f3 Discord RPC 2022-04-04 00:19:24 -04:00
e1b6311025 Give the game a name 2022-04-04 00:13:55 -04:00
1b32c57447 Possibly fix volume 2022-04-04 00:11:43 -04:00
7ef95458e3
Merge pull request #47 from Ewpratten/ewpratten/cutscene
Arty art
2022-04-04 00:07:35 -04:00
ab82ec626d Arty art 2022-04-04 00:07:07 -04:00
5a4729c78d
Merge pull request #46 from Ewpratten/demilurii/art2
intro cutscene comic
2022-04-03 23:49:48 -04:00
3b1b9c79ce intro cutscene comic 2022-04-03 23:47:40 -04:00
f2007d1d2b
Merge pull request #45 from Ewpratten/melting
Melting
2022-04-03 23:39:03 -04:00
f1d8ff3408 Pre-render footprints 2022-04-03 23:33:42 -04:00
064d14f97e
funny 2022-04-03 23:26:19 -04:00
00fa6edb20 Fix render order 2022-04-03 23:03:44 -04:00
cd5bb81f23
Merge branch 'master' into melting 2022-04-03 23:02:58 -04:00
bd713c3e75
Merge Stash 2022-04-03 22:59:51 -04:00
2d3e05f6f7
Merge branch 'melting' of github.com:Ewpratten/ludum-dare-50 into melting 2022-04-03 22:57:46 -04:00
46830e0f93
Load textures 2022-04-03 22:56:26 -04:00
a79f0e7c90 move market 2022-04-03 22:55:33 -04:00
f48e5c11b9
Shrinkage 2022-04-03 22:53:35 -04:00
f1886ef07f Mm 2022-04-03 22:52:39 -04:00
22f50bbd03
Load textures 2022-04-03 22:50:32 -04:00
c955f2370b
Shrinkage 2022-04-03 22:50:32 -04:00
88018f698d
Merge pull request #44 from Ewpratten/rsninja722/nice_map
Rsninja722/nice map
2022-04-03 22:50:11 -04:00
rsninja722
7ff54e78af Merge remote-tracking branch 'origin/master' into rsninja722/nice_map 2022-04-03 22:43:57 -04:00
rsninja722
2e50aafde3 temapuratures 2022-04-03 22:43:50 -04:00
548d09a2bf
Merge pull request #43 from Ewpratten/rsninja722/nice_map
The world map
2022-04-03 22:16:16 -04:00
fea13f549c
Merge pull request #42 from Ewpratten/SNOWZ7Z/pause_button_menu
Styling to the Labels
2022-04-03 22:06:46 -04:00
rsninja722
522bf8c759 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 21:56:42 -04:00
rsninja722
9d88a6bf65 object definitions 2022-04-03 21:56:23 -04:00
Marcelo Geldres
62430b3dca Styling to the Labels 2022-04-03 21:39:52 -04:00
db4d2e3c62 you melted ending screen edit 2022-04-03 21:18:51 -04:00
1f2f11fc57 you melted ending screen added 2022-04-03 21:16:22 -04:00
61a9f757e6
Merge pull request #41 from Ewpratten/ewpratten/the_end
Cup pointer
2022-04-03 20:46:56 -04:00
805ae65b8c Cup pointer 2022-04-03 20:46:06 -04:00
95eb21bdb1
Merge branch 'melting' of github.com:Ewpratten/ludum-dare-50 into melting 2022-04-03 19:58:17 -04:00
486a148614
Load textures 2022-04-03 19:56:42 -04:00
75c6c22a63
Shrinkage 2022-04-03 19:51:13 -04:00
0a42b0d9a2 car and truck varient objects 2022-04-03 19:50:56 -04:00
7ebc76450b
Merge pull request #40 from Ewpratten/ewpratten/the_end
Winning the game is a thing
2022-04-03 19:35:35 -04:00
13fbc9f8db Winning the game is a thing 2022-04-03 19:35:24 -04:00
rsninja722
39721968f3 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 19:20:30 -04:00
rsninja722
35342997cd map with new tiles 2022-04-03 19:20:21 -04:00
3d7285e51f market roof and interior with different colour varients 2022-04-03 18:32:48 -04:00
rsninja722
fee66753bc Merge remote-tracking branch 'origin/demilurii/harmony_export_test' into rsninja722/nice_map 2022-04-03 18:20:38 -04:00
rsninja722
abc65254eb Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 18:19:30 -04:00
b4ab6aa74e
Merge pull request #39 from Ewpratten/rsninja722/collisions
added collision detection and resolution
2022-04-03 18:11:45 -04:00
rsninja722
0bfc5d8468 Merge remote-tracking branch 'origin/master' into rsninja722/collisions 2022-04-03 18:05:49 -04:00
rsninja722
d6db37ca93 collisions with objects 2022-04-03 18:05:44 -04:00
7ae286b093
Merge pull request #38 from Ewpratten/SNOWZ7Z/pause_button_menu
Snowz7z/pause button menu
2022-04-03 17:57:49 -04:00