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

35 Commits

Author SHA1 Message Date
Axel Galand
0a9ed95350 Merge branch 'main' into Assets 2023-01-26 09:44:45 +01:00
Legonzaur
9a86a9e6d3 V0.1 2023-01-24 15:48:03 +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
7851343575 merge + added city 2023-01-23 09:17:24 +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
Legonzaur
e375769bd9 add occlusion maps 2023-01-18 16:52:52 +01:00
Legonzaur
effd267fbc add prises 2023-01-18 16:12:19 +01:00
Legonzaur
deab42bad3 Remove Oculus 2023-01-17 11:14:32 +01:00
Legonzaur
cc4b569ab3 Advancing on Catalog 2023-01-17 10:42:17 +01:00
Legonzaur
30bb7cc3f2 fix props placement and specularité 2023-01-17 09:32:55 +01:00
Axel Galand
60cb93ac06 textures ceiling wall floor 2023-01-16 16:36:04 +01:00
Axel Galand
0b8e2f6f47 "Push tout ce que t'as" 2023-01-16 11:51:31 +01:00
Legonzaur
de91eacae1 Change quality settings for Android 2023-01-13 22:43:47 +01:00
Legonzaur
fd3e30e0c0 Fix and enhance some models 2023-01-13 22:21:46 +01:00
Legonzaur
9a535fcbfc Fix keyboard and some assets 2023-01-13 18:34:09 +01:00
Legonzaur
5767a2caa8 add texture to keyboard 2023-01-13 13:53:47 +01:00
Legonzaur
556ca2259f rgb keyboard 2023-01-13 11:44:29 +01:00
K0RB4K
dadb97e2c6
Merge remote-tracking branch 'origin/Assets' into Assets 
# Conflicts:
#	Assets/Models/Blender/Indoor_plant_02.blend
#	Assets/Models/Blender/Indoor_plant_02.blend.meta
#	Assets/Models/Blender/laser_cutter.blend.meta
#	Assets/Texture/LaserCutter.meta
#	Assets/Texture/LaserCutter/Body.png.meta
 2023-01-12 12:09:52 +01:00
K0RB4K
9314ac85b8
indoor plants 2023-01-12 12:07:26 +01:00
Legonzaur
3f690ef763 Fix blender 2023-01-12 12:06:12 +01:00
Legonzaur
507e62fceb fix blender imports 2023-01-12 11:56:39 +01:00
Axel Galand
659860829a added some colliders and models to scene 2023-01-12 10:48:37 +01:00
K0RB4K
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
Legonzaur
d20d3e32ed Setup Neon Lighting 2023-01-10 10:41:31 +01:00
Legonzaur
c7549e453e Added Lamp correctly 2023-01-10 09:27:40 +01:00
Legonzaur
f8df52dfd6 Adding Lamp 2023-01-09 16:54:09 +01:00
Legonzaur
99ceb83739 Placing assets in scene 2023-01-09 15:42:52 +01:00
Legonzaur
0587074149 Test Hologram 2023-01-06 14:43:29 +01:00
Legonzaur
e6bef57ac3 Working on table hologram 2023-01-06 13:13:52 +01:00
Legonzaur
41065ecea5 Tri 2023-01-06 08:55:48 +01:00
Legonzaur
944ad71812 Add old fablab assets 2023-01-06 08:44:59 +01:00