Commit Graph

159 Commits

Author SHA1 Message Date
Ali 8119ff8620 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 14:12:07 +01:00
Ali 2fa9da0c69 level objects tagged 2021-01-31 14:11:11 +01:00
hans 0e7d03578a tag ground on Hans level 2021-01-31 13:07:32 +00:00
hans 3efdfeba5d Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:07:01 +00:00
GamerClassN7 22e5f58908 Quick fixes 2021-01-31 14:05:25 +01:00
hans 026bd4eea7 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:02:31 +00:00
Ali 919421fc07 powerups level2 2021-01-31 13:59:30 +01:00
GamerClassN7 1b8217a6f3 Before Release 2021-01-31 13:53:21 +01:00
GamerClassN7 1e5adb4149 Minor Tweeks 2021-01-31 13:51:02 +01:00
hans 4ea7e9902d Add Hans level 2021-01-31 12:46:25 +00:00
Ali b5cae58199 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:31:35 +01:00
Ali 62de2a91d7 levs 1 2 textures 2021-01-31 13:31:11 +01:00
GamerClassN7 9e72d0037d BG Prefab 2021-01-31 13:21:48 +01:00
hans 3f4add0bab add background prefab 2021-01-31 12:17:57 +00:00
Ali b9e74861bc Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:11:15 +01:00
Ali 65a2314570 level 3 fin 2021-01-31 13:10:50 +01:00
haitem 9590eca0b0 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:07:44 +01:00
haitem 3d3c0927df Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 13:07:18 +01:00
GamerClassN7 32b8d506c8 Level 3 2021-01-31 13:07:15 +01:00
haitem 35d3c77a50 Complete filip scene 2021-01-31 13:06:54 +01:00
Ali c0e8d510d0 level 3 textures 2021-01-31 13:01:20 +01:00
GamerClassN7 94c733c9be Changes For ALI 2021-01-31 12:34:29 +01:00
haitem 338db17975 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:26:42 +01:00
haitem 0dcd95dc6d Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:26:16 +01:00
GamerClassN7 e5504c64ce Level 1 -4 2021-01-31 12:26:10 +01:00
haitem 773ad1b725 Update Filip.unity 2021-01-31 12:26:09 +01:00
Ali 142c0c7d7a Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:23:47 +01:00
Ali be984c7701 restore levels 2021-01-31 12:22:25 +01:00
haitem e16be1885f Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:18:40 +01:00
haitem 3eb3e59f5b Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:17:36 +01:00
haitem e3708a9c32 Update filip scene texts again 2021-01-31 12:17:25 +01:00
Ali 03e15554aa Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:17:20 +01:00
Ali aaa8345702 levs 2 and 3 2021-01-31 12:17:08 +01:00
GamerClassN7 0ec824e46f Pitch 2021-01-31 12:14:10 +01:00
haitem 2ba98f7052 Some text edits 2021-01-31 12:11:25 +01:00
haitem be8d9e0713 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 12:07:30 +01:00
haitem 4cd64e3571 Remake Filip Scene 2021-01-31 12:07:24 +01:00
GamerClassN7 d39fd278c9 Fix 2021-01-31 12:07:05 +01:00
GamerClassN7 10208a4bbc Looping 2021-01-31 12:02:44 +01:00
haitem 672cdf8db8 Remake player prewfab and filip scene 2021-01-31 12:01:19 +01:00
GamerClassN7 42ec46d32b Player Prefab changes 2021-01-31 11:59:10 +01:00
haitem 37e93d3ea9 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 11:53:10 +01:00
haitem de96f77fd5 FilipScene edit 2021-01-31 11:52:46 +01:00
GamerClassN7 31f549c3d5 Audio 2021-01-31 11:52:14 +01:00
GamerClassN7 4125ab62bb Update EditorBuildSettings.asset 2021-01-31 11:43:49 +01:00
GamerClassN7 30e89e1a43 Audio 2021-01-31 11:43:48 +01:00
maarten e25dd8ddf4 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 11:39:59 +01:00
haitem 01d82755f2 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 11:29:00 +01:00
haitem dc9325e7c2 Remake prefabs and filip scene 2021-01-31 11:28:53 +01:00
GamerClassN7 c37d3871d3 AudioManager 2021-01-31 11:28:34 +01:00