Commit Graph

162 Commits

Author SHA1 Message Date
4707a51a68 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 20:28:51 +01:00
8ee6b445df preparing to solve a nasty merge conflict. 2022-01-29 20:28:42 +01:00
haitem
62f648cfb5 Edit some push and pull 2022-01-29 20:27:34 +01:00
GamerClassN7
35c93c6a4b Procedural Generation 2022-01-29 20:15:21 +01:00
haitem
41874041fa Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 20:12:18 +01:00
haitem
bae2df3fd8 Change some prefabs platform and player reaction 2022-01-29 20:12:11 +01:00
GamerClassN7
a54e05891a Procedural Generation FIXED I am so GOOD ?:) 2022-01-29 20:09:15 +01:00
ffc310a472 GAINT FREAKING MAGNETS BABY 2022-01-29 20:08:29 +01:00
GamerClassN7
cd9111e366 Gizmo 2022-01-29 19:41:35 +01:00
GamerClassN7
7ef3e2cd86 Procedural Generation Tweaks 2022-01-29 19:37:44 +01:00
haitem
b021ea4e9a Edit platform start prefab 2022-01-29 19:30:11 +01:00
haitem
4b67ce701f Start runing after click W 2022-01-29 19:26:09 +01:00
haitem
32337eadd1 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 19:14:51 +01:00
GamerClassN7
b915eb3120 Fixes 2022-01-29 19:13:40 +01:00
83892f1712 imporved scoring 2022-01-29 19:13:21 +01:00
80c944f6b0 fixed spiral 2022-01-29 19:07:18 +01:00
b0a0d01d6c Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 19:01:13 +01:00
f5090d77f7 fixed platform spiral height offset 2022-01-29 19:00:42 +01:00
GamerClassN7
5f2532576b Tweaks 2022-01-29 18:57:29 +01:00
9f33459578 configurable loop spawning 2022-01-29 18:55:05 +01:00
GamerClassN7
b4c9178e11 Tweak 2022-01-29 18:30:32 +01:00
GamerClassN7
dd2613e181 Procedural Generation Progress 2022-01-29 18:30:15 +01:00
7f06907704 added start platform and reduced glow 2022-01-29 18:13:00 +01:00
haitem
bc343ed072 Edit speed slower platform 2022-01-29 18:11:45 +01:00
haitem
371bd6b290 Remake particles by speed 2022-01-29 18:03:31 +01:00
haitem
05750f5ccc Edit platform setting 2022-01-29 17:33:28 +01:00
haitem
0039160c60 Edit visual of playerControler 2022-01-29 17:23:26 +01:00
haitem
9d2c50bdd4 change on haitem map 2022-01-29 17:14:55 +01:00
haitem
06eb63d3a9 Edit player controller 2022-01-29 17:06:48 +01:00
GamerClassN7
6f1d3b9cac Loop Generation 2022-01-29 16:58:20 +01:00
GamerClassN7
ce69db1383 Procedural Generation 2022-01-29 16:58:19 +01:00
haitem
281f111a6c Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 16:44:46 +01:00
haitem
a113a49e03 Create new system for runing 2022-01-29 16:44:40 +01:00
4044a13e13 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 16:28:06 +01:00
4b68e368fd generating circles 2022-01-29 16:27:55 +01:00
571d051305 green particles and sander scene 2022-01-29 16:12:12 +01:00
6a03433b1b added 3 level chunks 2022-01-29 16:05:33 +01:00
16e333b8b9 new folder 2022-01-29 15:55:57 +01:00
1a1263fda7 new prefab update 2022-01-29 15:54:30 +01:00
50f68a6fe6 added platform 2 2022-01-29 15:49:39 +01:00
haitem
3c91ac4d45 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 15:41:59 +01:00
haitem
9c2e253a74 Repair speed down 2022-01-29 15:41:54 +01:00
0cb415d674 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 15:40:13 +01:00
efb40a50bd look x limit 2022-01-29 15:40:02 +01:00
haitem
6d7f20fc6e Change physic material 2022-01-29 15:38:25 +01:00
haitem
120fa2a82b Some prefabs edit 2022-01-29 15:34:38 +01:00
haitem
44d2c3a64a Some prefabs edit 2022-01-29 15:11:32 +01:00
haitem
04ed79438f Remake prefabs 2022-01-29 15:08:02 +01:00
d25e7cd1e8 refactored PlayerController 2022-01-29 14:56:30 +01:00
haitem
81d813ade8 Unity scene haitem 2022-01-29 14:55:37 +01:00
haitem
6fa9d76bb9 Commit scene haitem 2022-01-29 14:54:00 +01:00
haitem
8386f83ee1 Fix not box collider 2022-01-29 14:13:35 +01:00
haitem
28c01da0ce Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 14:07:33 +01:00
haitem
924373bd86 Repair rotation 2022-01-29 14:07:27 +01:00
dd0b817d0e prefab update 2 2022-01-29 14:04:07 +01:00
d12edaf56b prefab update 2022-01-29 14:02:15 +01:00
haitem
e9ae2c3079 Commit merge 2022-01-29 13:51:01 +01:00
haitem
cd6745724d Some edits in playert 2022-01-29 13:48:05 +01:00
2465411ab1 platform 1
added platform 1 positive/negative/neutral
2022-01-29 13:32:16 +01:00
GamerClassN7
16f9b57dba Scene 2022-01-29 13:24:03 +01:00
GamerClassN7
8fed36613c Menu Prefab 2022-01-29 13:23:37 +01:00
GamerClassN7
ac3767805d Player Prefab 2022-01-29 13:23:35 +01:00
GamerClassN7
7b26149531 Menu Start 2022-01-29 13:23:34 +01:00
haitem
db767d7a9d Repair jump 2022-01-29 13:08:41 +01:00
haitem
217cd09194 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 12:50:32 +01:00
haitem
435fea4669 Edit player script 2022-01-29 12:50:26 +01:00
a16598060b refreshed player moodel 2022-01-29 12:50:09 +01:00
5a1c546b4f Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 12:41:59 +01:00
252decf253 work on gravity 2022-01-29 12:41:50 +01:00
haitem
91f0b8debf Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 12:27:09 +01:00
haitem
1053ccf402 Edit platforms prefabs 2022-01-29 12:27:03 +01:00
97680bbe87 sync 2022-01-29 12:21:38 +01:00
b326ddc304 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 12:14:11 +01:00
29c7a11897 changes to the testing scene 2022-01-29 12:14:07 +01:00
haitem
7baca74d34 Repair platform prefabs 2022-01-29 12:13:36 +01:00
haitem
9a86c54304 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 12:07:42 +01:00
haitem
d3d6e36bf0 edit own scene 2022-01-29 12:07:37 +01:00
3542e3a649 Testing scene #2 2022-01-29 12:07:29 +01:00
18e0b1bc7b Fixed weird collision angles. 2022-01-29 12:05:38 +01:00
11a517ba60 Fixed weird collision angles. 2022-01-29 12:03:01 +01:00
GamerClassN7
3dcacafb8b Speed Effect 2022-01-29 11:54:13 +01:00
GamerClassN7
e3ab4cc468 Blue Platform 2022-01-29 11:15:53 +01:00
GamerClassN7
2eac935320 Cool Test loop i Map 2022-01-29 11:11:08 +01:00
GamerClassN7
e207503538 Green platform Effects 2022-01-29 11:10:11 +01:00
bab441e902 Work on player movement 2022-01-29 10:57:53 +01:00
haitem
8aa168505d Complete speed platform 2022-01-29 03:25:16 +01:00
haitem
94950a79a1 Some edits 2022-01-29 03:15:33 +01:00
haitem
4a9967baa9 Repair particle and jump 2022-01-29 02:01:10 +01:00
haitem
ccd4d70b1e Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 01:47:47 +01:00
haitem
bccb63d7e9 Edit platformManager 2022-01-29 01:47:41 +01:00
GamerClassN7
2ab8dae8fe Particles 2022-01-29 01:47:23 +01:00
GamerClassN7
02290ccd03 Typo_2 2022-01-29 01:41:08 +01:00
GamerClassN7
807187e5bf Typo 2022-01-29 01:40:26 +01:00
GamerClassN7
ba58b9f74a Particles 2022-01-29 01:39:17 +01:00
GamerClassN7
2541ece2cc Improvements 2022-01-29 01:33:00 +01:00
haitem
a28ac03de5 Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022 2022-01-29 01:19:27 +01:00
haitem
142d0d0f52 Add platform manager 2022-01-29 01:19:21 +01:00
15f8422019 added sander scene 2022-01-29 01:05:10 +01:00
haitem
423d7eef23 Merge 2022-01-29 00:41:52 +01:00
haitem
8bc6bcdcc1 Repair change direction 2022-01-29 00:40:14 +01:00