Nicolas Picouet / gap-escaperoom / 0203653030b

Commits

$DESKTOP-6QODNRG\CuriousMedia$

DESKTOP-6QODNRG\CuriousMedia committed 0203653030bM16 Aug 2021

Merge 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

Showing diff to4d5d4c99370