Commit Graph

177 Commits

Author SHA1 Message Date
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 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
GamerClassN7 f3138df77c Level Sorry 2021-01-31 11:24:45 +01:00
haitem 55e9faeffc Some changis and remake filp level 2021-01-31 11:07:21 +01:00
haitem 9695241f31 Update Filip.unity 2021-01-31 06:06:12 +01:00
haitem 86db826a77 Some Power edit 2021-01-31 06:05:43 +01:00
haitem bda2349e16 Make sprite change in canvas about your ability 2021-01-31 05:11:44 +01:00
GamerClassN7 a91cb8a6ac Menus Fixes 2021-01-31 04:34:58 +01:00
hans 342e41379c Update background.png 2021-01-31 03:20:58 +00:00
haitem 07d745f82c Update PlayerManager.cs 2021-01-31 04:20:04 +01:00
GamerClassN7 09a86e504f Datamanger in use 2021-01-31 04:16:22 +01:00
haitem 563bdf456a Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 04:07:34 +01:00
haitem 49bcceb0b7 Make DataSaver 2021-01-31 04:06:54 +01:00
GamerClassN7 d699a1c6bd Update MainMenu.cs 2021-01-31 04:02:56 +01:00
GamerClassN7 e15499752f Icon and Middle Menu 2021-01-31 03:49:48 +01:00
hans edbe0c7255 add pyramid icon 2021-01-31 02:45:47 +00:00
GamerClassN7 a258192ef6 Middle Menu 2021-01-31 03:38:17 +01:00
maarten e5bb973b2e Add Audio
Added Audio and created script
2021-01-31 02:54:30 +01:00
haitem 4b374c6805 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 02:35:57 +01:00
haitem 7e3cc6ead6 Add power of Ladder climbing 2021-01-31 02:35:47 +01:00
hans bc26de77b0 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 01:35:41 +00:00
hans 691332869e add pickup model 2021-01-31 00:44:51 +00:00
GamerClassN7 6b518d3482 Final Level and cleanup 2021-01-31 01:36:02 +01:00
hans 6527a621df Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 00:20:39 +00:00
haitem 9b95224e59 Make som edits in player prefab and MainMenu 2021-01-31 01:18:37 +01:00
hans 1d944b2e0a add ladder model 2021-01-31 00:16:46 +00:00
haitem 142e43c9f8 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-31 00:44:49 +01:00
haitem c51d76fe30 bigger power changes 2021-01-31 00:44:40 +01:00
GamerClassN7 9a24d4d7aa Update MainMenu.unity 2021-01-31 00:31:59 +01:00
GamerClassN7 81c644c6d9 Update MainMenu.unity 2021-01-31 00:31:45 +01:00
haitem 1e1f618ff1 Scroll bar changes 2021-01-30 23:53:44 +01:00
GamerClassN7 8d9d78b554 Main Menu 2021-01-30 23:35:54 +01:00
GamerClassN7 4980b937cd Scene 2021-01-30 23:34:49 +01:00
haitem 8fb5f68c3a Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 23:33:07 +01:00
haitem a62bd37ef2 Edit bigger power 2021-01-30 23:32:59 +01:00
GamerClassN7 5788a5a859 Score Fetch 2021-01-30 23:32:21 +01:00
GamerClassN7 48970d57e5 Menu Fixes + Build order for levels 2021-01-30 23:32:19 +01:00
haitem 93432545e9 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 23:17:47 +01:00
haitem 34b5565b71 Add sign for first help 2021-01-30 23:17:05 +01:00
hans 79bf34021e add power icons 2021-01-30 21:55:17 +00:00
haitem 0d8312407a Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 22:19:40 +01:00
haitem bdc0c7ec31 Add pREFABS FOR DoubleJump, pushPull and Dash skills 2021-01-30 22:19:31 +01:00
GamerClassN7 c0ed8aceed Working Menu 2021-01-30 22:09:54 +01:00
GamerClassN7 2f4e14dabb Menu 2021-01-30 21:42:42 +01:00
hans aa80308f01 add stones texture 2021-01-30 20:39:16 +00:00
haitem 80b64561f7 Add poor menu 2021-01-30 21:23:55 +01:00
haitem 227096d3b5 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 20:56:12 +01:00
haitem 7a0d802852 Remake ank colection 2021-01-30 20:56:04 +01:00
hans d0793e726d Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 19:25:05 +00:00
haitem 7fd433d4e2 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 20:15:24 +01:00
haitem 7a310806ec Move animation in to folder animations 2021-01-30 20:15:17 +01:00
GamerClassN7 ad3269830c Done FBX 2021-01-30 20:11:31 +01:00
haitem 021942ec8c Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 20:05:26 +01:00
haitem 87124c53de Jump repair, add artefact prefab 2021-01-30 20:04:43 +01:00
hans b23c48a9f6 Add pyramid and background 2021-01-30 18:17:49 +00:00
Ali bd62b31550 level 3
added level 3
2021-01-30 19:10:54 +01:00
haitem d2bd761e2f Repair shader 2021-01-30 19:02:37 +01:00
haitem 77456cec41 Add riding saw and static saw 2021-01-30 18:24:29 +01:00
haitem 1f3da5e7f8 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 17:46:44 +01:00
haitem e38881d7a6 models 2021-01-30 17:46:35 +01:00
GamerClassN7 0d21f56165 saw 2021-01-30 17:45:55 +01:00
haitem 4c9a5fc2e2 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 17:44:25 +01:00
haitem 883b1bfb9f add saw 2021-01-30 17:44:13 +01:00
GamerClassN7 f06741f191 Obelisk And Piramid FIx 2021-01-30 17:35:09 +01:00
GamerClassN7 828abe7612 Obeliskand piramid 2021-01-30 17:27:49 +01:00
haitem 4a70125fff Fix som things on dash 2021-01-30 16:49:08 +01:00
haitem dc2b984951 fix player size 2021-01-30 16:43:04 +01:00
haitem 36360d9dba Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 16:40:51 +01:00
haitem 9b7cd8f04d Add dash in player powers 2021-01-30 16:40:42 +01:00
GamerClassN7 d9035be61b payer Flashlight 2021-01-30 16:35:35 +01:00
GamerClassN7 a6ad9f41fe nEW MODEL 2021-01-30 16:23:41 +01:00
haitem df49b292cb Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 16:16:52 +01:00
haitem dd17bac1d9 Add push pull power 2021-01-30 16:16:42 +01:00
Ali df8423257b level 2
added maartens other level design idea
2021-01-30 15:24:32 +01:00
haitem 849b105eee merg models 2021-01-30 14:56:07 +01:00
haitem a8e5dcf950 Merge branch 'master' of https://git.steelants.cz/GJP/GlobalGameJam-2021 2021-01-30 14:55:16 +01:00