Commit Graph

101 Commits

Author SHA1 Message Date
Daniel Tyomin
3414a62624 Merge branch 'master' of https://github.com/nothke/quality-control
# Conflicts:
#	Assets/Scripts/SlidingCrane.cs
2024-08-19 23:52:39 +02:00
Daniel Tyomin
f5b35c6516 More tuning 2024-08-19 23:43:05 +02:00
nothke
71f05400e4 Hammer now taken on start 2024-08-19 23:32:28 +02:00
nothke
3762b867aa Crane now rises and drops 2024-08-19 23:24:47 +02:00
Daniel Tyomin
475785c303 More tuning 2024-08-19 23:07:47 +02:00
nothke
1b2845032d Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-19 23:01:30 +02:00
nothke
d2d75ad9a6 Sliding crane with height 2024-08-19 23:01:26 +02:00
Daniel Tyomin
83fb2f186b Tweaking level 1 2024-08-19 22:53:56 +02:00
Daniel Tyomin
725c10e541 Fixed out of audio range error 2024-08-19 22:47:13 +02:00
Daniel Tyomin
10604a0fa9 Minor ups 2024-08-19 22:16:18 +02:00
Daniel Tyomin
19f2d59054 Crane minor changes 2024-08-19 20:31:53 +02:00
Daniel Tyomin
11ebf74721 various ups 2024-08-19 20:31:46 +02:00
Daniel Tyomin
a6682a2b8b Audio for some of the machines 2024-08-19 19:19:41 +02:00
Daniel Tyomin
2aae4ce4a1 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-19 19:00:39 +02:00
Daniel Tyomin
9c0b126578 Test config 2024-08-19 18:58:46 +02:00
Daniel Tyomin
124b959309 working on level 2 2024-08-19 18:58:20 +02:00
Daniel Tyomin
38d3ddf0a9 Minor ups. 2024-08-19 18:45:27 +02:00
Vuk
35aa42d166 more sounds 2024-08-19 18:41:32 +02:00
Daniel Tyomin
8cf260f47d Level 1 fix 2024-08-19 18:17:20 +02:00
Daniel Tyomin
c5d97df0d2 Level 1 2024-08-19 18:14:07 +02:00
Vuk
1c04f60d40 crane sounds 2024-08-19 18:12:33 +02:00
Vuk
291985d77f added more sounds 2024-08-19 18:05:00 +02:00
Daniel Tyomin
c08e310aa5 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-19 17:35:24 +02:00
nothke
d2686de669 New conveyors 2024-08-19 02:05:50 +02:00
Daniel Tyomin
0349263fdf Upping catwalk prefabs 2024-08-19 01:13:10 +02:00
Daniel Tyomin
83e7d9987b Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-19 00:43:35 +02:00
Daniel Tyomin
6c6c98b525 Playing with level design 2024-08-19 00:43:18 +02:00
nothke
e9dbc693be Added post processing 2024-08-19 00:34:49 +02:00
Daniel Tyomin
1b0cf8d159 Item spawn update. 2024-08-19 00:26:03 +02:00
Daniel Tyomin
b58dc516e1 Models and prefabs for boxed up items. 2024-08-19 00:25:51 +02:00
Daniel Tyomin
083b37cee3 Models and prefabs for boxed up items. 2024-08-19 00:25:33 +02:00
nothke
e10ab7cea3 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-19 00:14:03 +02:00
nothke
072b143242 Factory walls 2024-08-19 00:13:56 +02:00
Daniel Tyomin
a90c2400eb Messing with meshes and object spawning 2024-08-18 23:36:45 +02:00
Daniel Tyomin
8e357f12d6 Calibrated conveyor speed 2024-08-18 22:01:23 +02:00
Daniel Tyomin
70d7cab3b9 Fixed level loading, added level reset 2024-08-18 22:01:15 +02:00
nothke
979392aa12 Factory walls 2024-08-18 19:37:12 +02:00
Khauvinkh
3036732a0d Fixing small bugs. 2024-08-18 19:27:27 +02:00
Khauvinkh
9b4726113a More scoring. 2024-08-18 18:55:24 +02:00
Khauvinkh
ded4de5cca Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-18 18:42:35 +02:00
Khauvinkh
5bcc96a4a0 Scoring and stuff. 2024-08-18 18:42:01 +02:00
Vuk
6a113cb255 added main ambiant sound 2024-08-18 18:38:45 +02:00
Vuk
340affb9b9 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-18 17:59:31 +02:00
Vuk
8c296e7e17 hammer sounds maybe? 2024-08-18 17:59:27 +02:00
Khauvinkh
1946669e64 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-18 17:51:09 +02:00
Khauvinkh
a2584d9640 Assembling Main scene. 2024-08-18 17:48:35 +02:00
nothke
b3a0a736f3 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-18 16:33:03 +02:00
nothke
81ad6d6390 Magnet cables 2024-08-18 16:32:52 +02:00
Vuk
390832fdf9 more sounds 2024-08-18 16:27:33 +02:00
nothke
2de1111cd0 Swingin' magnet 2024-08-18 16:19:17 +02:00