- Nov 14, 2016
-
-
mitchelkovacs authored
-
mitchelkovacs authored
This reverts commit 9c227764.
-
mitchelkovacs authored
This reverts commit eecf28f8.
-
mitchelkovacs authored
-
Graham Solie authored
# Conflicts: # Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo # Zookeepers Trial/Assets/Scenes/arena.unity # Zookeepers Trial/Assets/Scripts/EnemyAI.cs # Zookeepers Trial/Assets/Scripts/WeaponList.cs.meta # Zookeepers Trial/Library/CurrentLayout.dwlt # Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll # Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb # Zookeepers Trial/Library/assetDatabase3 # Zookeepers Trial/Library/expandedItems # Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 # Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 # Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 # Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0 # Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918 # Zookeepers Trial/Library/metadata/12/121b25d3976123f46820001203d77356 # Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8 # Zookeepers Trial/Library/metadata/3c/3c524b654b3be1a40b706265442b627e # Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0 # Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e # Zookeepers Trial/Library/metadata/53/537bd552e039b684db164ee454e43761 # Zookeepers Trial/Library/metadata/63/635041fed7255734985fccf72de67b7b # Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435 # Zookeepers Trial/Library/metadata/a8/a8e0d5f7e4068964cb6c2a24f6df4f0f # Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4 # Zookeepers Trial/Library/metadata/cc/cc90e67fd939945489f1138d1179168d # Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc # Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5 # Zookeepers Trial/Library/metadata/e0/e0bf1c78c054a6a408949e9df9521b90 # Zookeepers Trial/Library/metadata/ea/eac8a591b609c2e44b342900c77e01a5
-
Graham Solie authored
-
Graham Solie authored
-
- Nov 13, 2016
-
-
Michael LaFreniere authored
-
Michael LaFreniere authored
Should function properly again
-
Michael LaFreniere authored
no longer can "enter" it
-
Mitchel Kovacs authored
-
Mitchel Kovacs authored
-
Michael LaFreniere authored
This reverts commit 7b00fa6f.
-
Mitchel Kovacs authored
-
Jordan authored
- Located in creation scene -> canvas -> choose character stats - Change that to change starting weapon
-
Jordan authored
- Stored in weaponList script so you only have to set once! - Should persist through scenes if player has playerStats script on
-
Jordan authored
-
Jordan authored
-
Jordan authored
- Need to add setAppearance script on each character to make it persist - Stats should be persisting - Appearance persisting - Weapon is not at the moment
-
Jordan authored
-
Mitchel Kovacs authored
-
Mitchel Kovacs authored
This reverts commit fc0f1ccb.
-
Mitchel Kovacs authored
-
- Nov 12, 2016
-
-
Michael LaFreniere authored
-
Michael LaFreniere authored
-
Mitchel Kovacs authored
-
Michael LaFreniere authored
got a few buttons going (character doesnt transfer over yet)
-
Michael LaFreniere authored
-
- Nov 11, 2016
-
-
Michael LaFreniere authored
will fix on play mode (should work for any sized screen) looks a little silly during scene view though. - few main screen tweaks (button highlights)
-
Jordan authored
-
Michael LaFreniere authored
# Conflicts: # Zookeepers Trial/Assets/Scenes/characterCreation.unity
-
Michael LaFreniere authored
-
Michael LaFreniere authored
Fixed the different screen size issue (during play mode, looks silly during scene view though)
-
Jordan authored
-
Jordan authored
- Still needs to persist to other scenes - Slider value works now
-
Jordan authored
-
Jordan authored
- Needs more parts - Probably not persisting through scenes yet - Hue not implemented yet - Need to make sure all parts are same size
-
Jordan authored
- Body options now array in "CharacterDisplay" Alot easier to set! - Filled in ChooseCharLook, almost done needs to communicate with setAppearance only
-
Jordan authored
- Now takes more character part option, public variable for each in "CharacterDisplay" object - Removed arm and replaced with shield
-
Jordan authored
- All animations are the SAME as the player now - The animation variable "speed" used to be bool, now it's float (like player)
-