Nicolas Picouet
  1. Nicolas Picouet

gap-escaperoom

Public

Network

 
AuthorCommitMessageCommit Date
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
df97d15f400round 3 changes
Nicolas PicouetNicolas Picouet
6c1b2b73ff9build 9 hub collider fix
Nicolas PicouetNicolas Picouet
6386e39776dbake and build 8
Nicolas PicouetNicolas Picouet
99e46cbf033MMerge branch 'feature/puzzle-completion' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset
Nicolas PicouetNicolas Picouet
31c4d711ad0crank textured. lever textured.
Nicolas PicouetNicolas Picouet
63a3c9db2c8textured button
Nicolas PicouetNicolas Picouet
ea614a6a202remove debugs
Nicolas PicouetNicolas Picouet
126cc7d263fcolor pallette. complete state changes
Nicolas PicouetNicolas Picouet
e2bc729b7ddlights and completion VO
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
b271cdc7d59moved lights
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
f4ff91da7feMMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/_Content/Game/Prefabs/Puzzles/CircuitPuzzle.prefab
Nicolas PicouetNicolas Picouet
4d4f1a8f55cbaked and build 7
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
677437988b8Added pool
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
2d5299e0464MMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
71d90bfa100added lever icons
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
d7e2d060d96Circuit puzzle Transformer visual cable connections and frames added
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
fece9dccd52same as last
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
9bd1cd560ecshape colors are now consistent in sequence puzzle
Nicolas PicouetNicolas Picouet
e4672b0f8e8updated circuit text. updated crank for baking.
Nicolas PicouetNicolas Picouet
fd68ae247b2MMerge branch 'feature/grid-puzzle-simplify' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
0a7f0dbda4cgrid puzzle black / white squares
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
dbe8bc1cc9aImplemented some fixes from test 2
Nicolas PicouetNicolas Picouet
619463a4ce7timer increase to 30 min. build 6.
Nicolas PicouetNicolas Picouet
a81f32ca5e7bake and build 5
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
db8b531e700added light to circuit puzzle, also fixed emmision bug on LightFixture class
Nicolas PicouetNicolas Picouet
cc812952acegrab fix
Nicolas PicouetNicolas Picouet
77d18362bceremove occlusion data
Nicolas PicouetNicolas Picouet
43f1270bcc2MMerge branch 'feature/nic-polish' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
5d61279f7c2added pinch poses. improved circuit puzzle.
Nicolas PicouetNicolas Picouet
5d5028d1e36fixed robot vo
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
7dcfe52b3faAdded feedback lights, and updated some of the puzzle prefabs
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
397c423c7bbno message
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
5c1ca4ba382Fixed some bugs in Grid, Sequence, and Crank puzzles, and updated pre-fabs
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
5e7be8b4fb3Light pole and screen texture updates
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
d73163f02ebMMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
Nicolas PicouetNicolas Picouet
25b6c43689ebake and build 4
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
53f78ec7ef3Added grid puzzle misc items textures
Nicolas PicouetNicolas Picouet
522a24adab1MMerge branch 'feature/hub-texturing' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset # GAP Escape Room/UserSettings/EditorUserSettings.asset
Nicolas PicouetNicolas Picouet
bdc5dd8aa5blever podium textured
Nicolas PicouetNicolas Picouet
14694d1d212robot pedestal textures
Nicolas PicouetNicolas Picouet
e74ac880243reduced MSAA to 2x. added menu fader. changed ui controller layer.
Nicolas PicouetNicolas Picouet
c5364555dceauto switch hands on ui.
Nicolas PicouetNicolas Picouet
99c90e54cc2occlusion baking
Nicolas PicouetNicolas Picouet
5eeda0ce79ewin and lose state. timer stop on complete. lights activate on skip tutorial.
Nicolas PicouetNicolas Picouet
bc9e6d64c2ahub overhaul
Nicolas PicouetNicolas Picouet
278d45950e6bake + pipes
Nicolas PicouetNicolas Picouet
612eac9edc0MMerge branch 'develop' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
3b8a49c8b45Added more textures and UV unwrapped
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
97c44481957water junction textures added and UV unwrapped
DESKTOP-6QODNRG\CuriousMediaDESKTOP-6QODNRG\CuriousMedia
cd2133ae0edCooling tower textures added, some other textures re-organized