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

115 Commits

Author SHA1 Message Date
K0RB4K
d03c857cc1
Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-26 16:58:51 +01:00
Axel Galand
f774a35bcd added hands to figurines 2023-01-26 16:38:01 +01:00
K0RB4K
fe8f03a849
Merge remote-tracking branch 'origin/Assets' into Assets 2023-01-26 16:19:52 +01:00
K0RB4K
b6ec0904f2
HMD + netbox fixes 2023-01-26 16:19:28 +01:00
Legonzaur
6547f3fd02 fix plants 2023-01-26 15:48:23 +01:00
Legonzaur
4d22979299 fix poses aznd colliders 2023-01-26 15:33:10 +01:00
Legonzaur
7bd6a33505 fix walls for the 5th fucking time 2023-01-26 15:18:48 +01:00
Axel Galand
b75d832d0e e 2023-01-26 15:12:13 +01:00
Axel Galand
f9c45acde0 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-26 15:12:05 +01:00
Axel Galand
0e87b30f03 fix images 2023-01-26 15:11:37 +01:00
Axel Galand
5be0402344 fix images 2023-01-26 15:11:25 +01:00
Legonzaur
3c5692af2a fix poses and figurnies 2023-01-26 15:07:41 +01:00
Legonzaur
f817238ce9 batman & ironman poses 2023-01-26 15:00:23 +01:00
Legonzaur
208632567e Fix some models 2023-01-26 14:42:05 +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
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
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
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
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
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
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
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
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
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
Legonzaur
482129636f Advancing in Catalog 2023-01-17 16:11:12 +01:00
Legonzaur
7c200b5865 Change default knuckle binding 2023-01-17 12:11:57 +01:00
Legonzaur
25473c4936 Remove oculus 2023-01-17 11:15:30 +01:00
Legonzaur
cc4b569ab3 Advancing on Catalog 2023-01-17 10:42:17 +01:00