Commit Graph

59 Commits

Author SHA1 Message Date
Daniel Tyomin
15a3d8238f ups 2024-08-20 03:30:10 +02:00
Daniel Tyomin
ff6b95b251 UI ups 2024-08-20 01:43:15 +02:00
Daniel Tyomin
944cd28efb Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-20 00:32:13 +02:00
Daniel Tyomin
923a3fbe79 Layout done. 2024-08-20 00:31:38 +02:00
nothke
a28680b344 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-20 00:20:44 +02:00
nothke
965e207eb4 Right click hammer time! 2024-08-20 00:20:33 +02:00
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
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
38d3ddf0a9 Minor ups. 2024-08-19 18:45:27 +02:00
nothke
d2686de669 New conveyors 2024-08-19 02:05:50 +02:00
Daniel Tyomin
1b0cf8d159 Item spawn update. 2024-08-19 00:26:03 +02:00
Daniel Tyomin
083b37cee3 Models and prefabs for boxed up items. 2024-08-19 00:25:33 +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
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
5bcc96a4a0 Scoring and stuff. 2024-08-18 18:42:01 +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
nothke
2de1111cd0 Swingin' magnet 2024-08-18 16:19:17 +02:00
nothke
464c091655 Sliding crane art and fixing 2024-08-18 16:11:53 +02:00
Khauvinkh
683f839905 Reworking item spawn, adding item conversion. 2024-08-18 14:44:44 +02:00
nothke
d2c3dff101 Added interaction, hand, rigidbody dragging, picking up hammer 2024-08-18 13:21:38 +02:00
Khauvinkh
ae76789a51 Added defect detector prefab. 2024-08-17 21:07:25 +02:00
Khauvinkh
ece1afe008 Removed erroneous force application to player. 2024-08-17 20:47:21 +02:00
Khauvinkh
dc6b67ccd3 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-17 20:39:44 +02:00
Khauvinkh
a5e306eb33 Added more prefabs 2024-08-17 20:38:25 +02:00
nothke
747458335d Added NAudio 2024-08-17 20:17:15 +02:00
nothke
dd1c0284ab Magnet no longer sticking to itself, and crane stuff 2024-08-17 16:55:28 +02:00
nothke
fae1548cf4 More realistic magnets and a little bit of waiting time 2024-08-17 16:39:05 +02:00
nothke
41ed2e559f Crane logic fixes 2024-08-17 16:29:47 +02:00
nothke
b2d8ac944c Working magnet and crane AI 2024-08-17 16:13:26 +02:00
nothke
601c99ebf6 Magnet 2024-08-17 15:13:39 +02:00
Khauvinkh
fa1e2ddbf4 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-17 15:12:30 +02:00
Khauvinkh
5a8bab2f41 Prototyped the object production scheduling. 2024-08-17 15:12:00 +02:00
nothke
ecf58d32c7 Sliding crane can track world targets 2024-08-17 14:38:36 +02:00
Khauvinkh
4c839e6f98 Merge branch 'master' of https://github.com/nothke/quality-control 2024-08-17 13:59:50 +02:00