Nicolas Picouet
  1. Nicolas Picouet

gap-escaperoom

Public

Network

 
AuthorCommitMessageCommit Date
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
99c57680cd7Optimized and textured transformer from circuit puzzle
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
9fd6bdbfcf5Added analog readout to crank puzzle
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
65a97b040ceCircuit puzzle start_grabber fix
Nicolas PicouetNicolas Picouet
6beaeb80907full bake. fixed pointer finger. added "hand" tag. cleaned up prefabs.
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
0203653030bMMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # BlenderFiles/nic-hand.blend # GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset # GAP Escape Room/Assets/_Content/Game/Prefabs/Puzzles/CircuitPuzzle.prefab # GAP Escape Room/UserSettings/EditorUserSettings.asset
Nicolas PicouetNicolas Picouet
4d5d4c99370MMerge branch 'feature/hub-redesign' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
d01f111be7ccleanup old hub objects
Nicolas PicouetNicolas Picouet
2a3984ac4e3removed nic hand
Nicolas PicouetNicolas Picouet
e2dff6a6015removed old hand
Nicolas PicouetNicolas Picouet
ba110d63c34MMerge branch 'feature/hub-redesign' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
e85f14a2ab8full hub update
Nicolas PicouetNicolas Picouet
4dcdef562adteleport rotation fix
Nicolas PicouetNicolas Picouet
c12ad0c65eacontrollers in hub
Nicolas PicouetNicolas Picouet
e61a6e9019cjavier hands
Nicolas PicouetNicolas Picouet
0c61c176058added timer. added textmeshpro.
Nicolas PicouetNicolas Picouet
2eaa38fb992hub updates
Nicolas PicouetNicolas Picouet
a9d3a58a3d3build 2
Nicolas PicouetNicolas Picouet
3584d3719beadded fonts
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
433879e2b8bCleaned up circuit puzzle comment code, and updated prefab overrides
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
4cf13b3df51Fixed circuit puzzle issues, and added lights to visualize what rule was broken.
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
0fde9d8db40Updated handles on griz puzzle
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
b3d5fd58eb0removed blender files from GIT side of project
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
02868771d0cUpdated grid models to more optimized versions
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
ebbf05efc98Hand updates
Nicolas PicouetNicolas Picouet
14e975427f8MMerge branch 'feature/hand-tracking-pose-creator' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
46f31547982nic test hands. hand texture test. new poses. tutorial fixes.
Nicolas PicouetNicolas Picouet
7a12b40852cMMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into feature/hand-tracking-pose-creator
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
9c17f4b99eaMMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
79dff71b2e4new audio. full bake. labels.
Nicolas PicouetNicolas Picouet
d81a08e2029MMerge branch 'feature/nicolas-improvements' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset
Nicolas PicouetNicolas Picouet
f401e54b88aadded thumbstick left and right rotation
Nicolas PicouetNicolas Picouet
79f7e82bbceadded thumbstick actions
Nicolas PicouetNicolas Picouet
681e0135503grid puzzle 1 panel. grid animations. button auto fixes.
Nicolas PicouetNicolas Picouet
d48513ae42fgrid updates. test bake.
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
eed0c50af82Added Hand
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
2c94fbbf477made puzzle prefabs static
Nicolas PicouetNicolas Picouet
e5aba465d4bupdated prefabs with new grabbing and buttons
Nicolas PicouetNicolas Picouet
c84603c5c92MMerge branch 'feature/texturing-test' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/_Content/Game/Scenes/Hub.unity # GAP Escape Room/UserSettings/EditorUserSettings.asset
Nicolas PicouetNicolas Picouet
bd1501799aacrank hand attachment
Nicolas PicouetNicolas Picouet
aea9dab1c8clever attach pose. farther let go radius
Nicolas PicouetNicolas Picouet
45baf2195d8new bake. flattened external rooms.
Nicolas PicouetNicolas Picouet
999184eff42automatic button
Nicolas PicouetNicolas Picouet
4a7f2083875water clip shader
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
76150f0db3ecore model changes
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
c0c80bb3c96Updated crank puzzle. Added nuclear core model.
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
39947d3a73aMMerge branch 'feature/texturing-test' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into feature/puzzle_feedback_fixes_first_round
Nicolas PicouetNicolas Picouet
a1135b28b2crobot updates. robot pedestal. robot vo for each puzle.
Nicolas PicouetNicolas Picouet
b790cbb38aehologram testing
Nicolas PicouetNicolas Picouet
40d9a553e70MMerge branch 'feature/puzzle_feedback_fixes_first_round' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into feature/texturing-test
Nicolas PicouetNicolas Picouet
b4f00793755MMerge branch 'feature/puzzle_feedback_fixes_first_round' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into feature/texturing-test # Conflicts: # GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset # GAP Escape Room/UserSettings/EditorUserSettings.asset