Luke Stampfli
|
df12c899
|
Add NetworkingManagerHUD
|
4 年前 |
David Woodruff
|
ccbe1020
|
taking develop merge
|
4 年前 |
|
David Woodruff
|
64008746
|
adding stormflag art assets and test scene
|
4 年前 |
jdepuy
|
89706c47
|
Integrated new UI for Title screen and stub for Char Select. Dungeon adjusted to show character lineup.
|
4 年前 |
GitHub
|
f57f9a2e
|
Merge pull request #16 from Unity-Technologies/jdp_main_menu_ui
Integrated new UI for BossRoom Title screen and stub for Char Select. Dungeon adjusted to show character lineup.
|
4 年前 |
eheimburg
|
e96bb41c
|
Merge remote-tracking branch 'origin/sfdev' into eh_integratecharacterset
|
4 年前 |
|
David Woodruff
|
6866f803
|
cleaning up some empty methods
|
4 年前 |
|
David Woodruff
|
7360d6b6
|
more rearranging scripts.
|
4 年前 |
|
GitHub
|
3cc6f6be
|
Merge pull request #18 from Unity-Technologies/dmw_actionsystem
Action System V1
|
4 年前 |
CGerrits SF
|
f6c1ab34
|
Continued work on swap script. Added missing gear slot and handling of unset objects
|
4 年前 |
|
CGerrits SF
|
1647df16
|
Added models to swap script
|
4 年前 |
|
CGerrits SF
|
10a4d2c8
|
Fixed issue with rogue head being wrong reference
|
4 年前 |
|
CGerrits SF
|
c46f5de0
|
Updated prefab to not have hotkey selected by default, cleaned up accordingly
|
4 年前 |
|
David Woodruff
|
4c1fe0b4
|
initial pass at asset removal
|
4 年前 |
|
David Woodruff
|
a17a40e5
|
taking asset removal merge
|
4 年前 |
|
CGerrits SF
|
10777a5f
|
tweaks to line up with intended functionality
|
4 年前 |
|
David Woodruff
|
93cc4c2e
|
taking merge
|
4 年前 |
|
David Woodruff
|
84add18e
|
reversing light_flicker script move so that it can hang out in a separate PR
|
4 年前 |
|
GitHub
|
758dc87d
|
Merge pull request #33 from Unity-Technologies/sfdev
taking sfdev to develop
|
4 年前 |
|
CGerrits SF
|
38d4837d
|
merge with sfdev
|
4 年前 |
|
Luke Stampfli
|
aaf62377
|
Merge branch 'develop' into feature/pathfinding
# Conflicts:
# Assets/BossRoom/Scenes/DungeonTest.unity
# Assets/BossRoom/Scripts/Client/ClientInputSender.cs
# Assets/BossRoom/Scripts/Server/Game/Action/ChaseAction.cs
# Assets/BossRoom/Scripts/Server/ServerCharacterMovement.cs
# ProjectSettings/DynamicsManager.asset
# ProjectSettings/NavMeshAreas.asset
# ProjectSettings/TagManager.asset
|
4 年前 |
