VR-Sexe/Phillipes_Fablab
5
0
Fork 0
generated from VR-Sexe/Unity3DTemplate
Code Issues Pull Requests Packages Projects Releases Wiki Activity
169 Commits 3 Branches 0 Tags 1.5 GiB
88c5415f42
Commit Graph

169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
K0RB4K
88c5415f42
unity metadata 2023-01-26 11:36:48 +01:00
K0RB4K
6496c45974
Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-26 11:35:42 +01:00
K0RB4K
4e640fc16f
netbox prefab 2023-01-26 11:35:31 +01:00
Axel Galand
a273042afc Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-26 11:17:08 +01:00
Axel Galand
6b84698609 lights 2023-01-26 11:16:54 +01:00
Axel Galand
3af6b12c32 merge scripts 2023-01-26 11:16:32 +01:00
K0RB4K
74870f5a33
Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-26 11:14:12 +01:00
K0RB4K
ac1b67140b
netbox optimized 2023-01-26 11:14:01 +01:00
Axel Galand
ef8f8d9f06 Merge branch 'Scripting' into Assets 2023-01-26 09:53:53 +01:00
Axel Galand
0a9ed95350 Merge branch 'main' into Assets 2023-01-26 09:44:45 +01:00
Axel Galand
c59180c3f2 tv screen content 2023-01-26 09:44:25 +01:00
Axel Galand
144bf2f11e Fixed some assets 2023-01-24 15:49:58 +01:00
Legonzaur
9a86a9e6d3 V0.1 2023-01-24 15:48:03 +01:00
Legonzaur
a37b60f5a5 Catalog & Grab working 2023-01-24 15:46:04 +01:00
Axel Galand
f7b0f44dbd reimport steamVR + fix hands 2023-01-24 15:16:12 +01:00
Legonzaur
af8a034898 Fix wall gap 2023-01-24 09:32:07 +01:00
Legonzaur
4f64ca28fd Fix prefab pivot and advancing on furnitureMover 2023-01-23 16:59:00 +01:00
Legonzaur
a458ca5f57 Fix pivot points for furniture 2023-01-23 15:58:22 +01:00
Legonzaur
5657cc14d5 fix fablab floor 2023-01-23 15:25:26 +01:00
Legonzaur
d8197683bd fix wall placement 2023-01-23 15:15:04 +01:00
Legonzaur
13b2a1b391 add set walls to static for baked lighting 2023-01-23 15:13:21 +01:00
Legonzaur
87df1087a6 Fix static objects in scene for lightingh 2023-01-23 15:07:32 +01:00
Legonzaur
2b516513f7 Merge Assets to Scripting 2023-01-23 14:54:19 +01:00
Axel Galand
8d43eb2ae8 laser 2023-01-23 11:39:06 +01:00
Axel Galand
1fd7acd26b Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-23 11:38:45 +01:00
Axel Galand
064a9a137b less grass 2023-01-23 11:38:21 +01:00
Legonzaur
f831e34bdd fix glass 2023-01-23 11:10:44 +01:00
K0RB4K
32f53da1f1
some unity metadata 2023-01-23 10:51:12 +01:00
K0RB4K
cb917ad376
Merge remote-tracking branch 'origin/Assets' into Assets 
# Conflicts:
#	Assets/Materials/LaserCutter.meta
#	Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta
#	Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta
#	Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta
#	Assets/Models/Blender/laser_cutter.mtl.meta
#	Assets/Models/Blender/laser_cutter.obj.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
 2023-01-23 10:45:24 +01:00
K0RB4K
7c2b32d452
small laser cutter fixes 2023-01-23 10:44:35 +01:00
Axel Galand
97abeca9b8 the fenetre is working 2023-01-23 10:37:26 +01:00
Axel Galand
7851343575 merge + added city 2023-01-23 09:17:24 +01:00
Axel Galand
5baed8a5e4 bit of scenery, need to fix lights + add few buildings 2023-01-20 11:31:23 +01:00
K0RB4K
400e23adc9
merge remote to laser cutter 2023-01-19 12:18:04 +01:00
K0RB4K
947ce85ffb
laser cutter done 2023-01-19 12:04:13 +01:00
Axel Galand
293cd3f04b merge 2023-01-19 10:39:40 +01:00
Axel Galand
fc322562f1 Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-19 10:39:31 +01:00
Axel Galand
ab838b5fcb added window + building assets 2023-01-19 10:35:19 +01:00
Legonzaur
fdb7d38190 Remove OpenXR 2023-01-19 08:58:14 +01:00
Legonzaur
c816fde9c1 Merge yesterday catalog with todays work 2023-01-18 17:40:15 +01:00
Legonzaur
7df05aedf9 add Prisesfix normals of some models 2023-01-18 16:58:20 +01:00
Legonzaur
e375769bd9 add occlusion maps 2023-01-18 16:52:52 +01:00
Axel Galand
a9084d3389 e 2023-01-18 16:31:04 +01:00
Axel Galand
53543caeca Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-18 16:30:55 +01:00
Axel Galand
4b5b691e6b + 2023-01-18 16:23:15 +01:00
Axel Galand
002e7278a1 try furniture movement but not working 2023-01-18 16:22:23 +01:00
Legonzaur
b3ff0426f6 fix prises 2023-01-18 16:17:50 +01:00
Legonzaur
effd267fbc add prises 2023-01-18 16:12:19 +01:00
Axel Galand
518e6d2137 Merge remote-tracking branch 'origin/Scripting' into Assets 2023-01-18 16:10:23 +01:00
Axel Galand
3612d56e04 few change idk 2023-01-18 16:07:08 +01:00