df59e229
Merge branch 'sfdev' into jdp_bb_art
4 年前
ebc9ae60
Adjusted Main menu so it stretches and the font for text input is higher rez. Rendering path is now set to Deferred
4 年前
4e0d4420
taking feedback from holiday PRs
4 年前
8c65ea88
taking develop merge
4 年前
3d4a7c76
feat: Add NavMeshComponents
NavMeshComponents are needed to fix some of our navmesh issues. Mainly NavMeshSurface helps us to patch the iron bar tiles with lava underneath which weren't captured in the bake.
4 年前
dcc35d9f
fixed material issue with rogue Eyes
4 年前
6cfc5061
Removed accidental addition of CharacterSwap
4 年前
9bd318c1
Replaced Boss with new Prefab that contains a cape rig, materials correctly setup for Boss Eyes and Face, raw models (rigged) are in for Imp, dungeon lightsetup updated
4 年前
78c71c5c
Merge pull request #25 from Unity-Technologies/jdp_bb_art
Added new suite of Tank Class animations including knockback, fixed material on Boss head and imp head
4 年前
10a4d2c8
Fixed issue with rogue head being wrong reference
4 年前
63336deb
Further tweaks to click feedback
4 年前
1647df16
Added models to swap script
4 年前
d23d3482
Tweaked for PR Feedback- added SelfDisableScript as well as changes to Click_Feedback.cs
4 年前
258e29d7
Added new suite of Tank Class animations including knockback, fixed material on Boss head and imp head
4 年前
d1b5bf7d
Merge branch 'sfdev' into jdp_bb_art
4 年前
f6c1ab34
Continued work on swap script. Added missing gear slot and handling of unset objects
4 年前
12e1b24a
sfdev merge
4 年前
7254e8bc
Added new ground target texture for said prefab
4 年前
fe41ca16
adding some more imps. removing default archer. changing UI scaling on main menu
4 年前
d0f44a55
Added quad for click feedback on player move
4 年前
db17a68d
Added temporary imp, placed Boss, and fixed seams in dungeon ground tiles
4 年前
3d9bcf77
Merge pull request #22 from Unity-Technologies/dmw_hitaction
physics-based melee hit action
4 年前
f6b9a66a
got hit action working with basic physics detection. Added stub for characters dying--right now they just instantly destroy themselves
4 年前
9159e364
making the enemy prefab use the Boss viz asset
4 年前
36a7d413
Merge remote-tracking branch 'origin/sfdev' into dmw_fixtargeting
4 年前
27d21244
Merge pull request #21 from Unity-Technologies/eh_protoai2
Simple AI based on Actions
4 年前
3bee0ea3
Simple AI based on Actions
- added AIBrain which can switch between Idle and Attack. Owned by ServerCharacter
- renamed Action enum to ActionType to prevent name conflicts with Action class
- gave NetworkingManager its own prefab (this is the only change to MainMenu)
- testing hack: press the "E" key on the server/host to spawn an enemy at 0,0,0
4 年前
d1317bb5
fixing targeting (rigidbodies now come along with gameobjects as they move), and adding smoothing to graphics representation of entities
4 年前
de3a5819
Merge pull request #20 from Unity-Technologies/dmw_chaseaction
adding ChaseAction
4 年前
63c07658
adding ChaseAction. refactoring actions a bit so that ActionLogic metadata is used to serialize the ActionRequestData. Making Action queueing behavior specifiable in the ActionRequestData. Hooking up an example where a player 'moves and attacks' in ClientInputSender. Adding a ClientCharacterMovement component to move the base Player GameObject (previously only the visualization was moving)
4 年前
3cc6f6be
Merge pull request #18 from Unity-Technologies/dmw_actionsystem
Action System V1
4 年前
2b141f5a
adding GOMPS task for ScriptableObject action system fixmes
4 年前
ee7022ed
fixing missing faces problem, and correcting an issue where two host player prefabs were being created
4 年前
4c4f0cfb
taking sfdev merge
4 年前
8509d7d6
adding ranges
4 年前
5458ac01
Merge pull request #17 from Unity-Technologies/eh_integratecharacterset
Support for animation and spawning player in DungeonTest scene
4 年前
79f53a0f
suggested changes from PR
4 年前
7360d6b6
more rearranging scripts.
4 年前
dcf0c6dc
merge changes from sfdev
4 年前
6866f803
cleaning up some empty methods
4 年前
e96bb41c
Merge remote-tracking branch 'origin/sfdev' into eh_integratecharacterset
4 年前
574fd252
2nd pass on action system. Not properly replicating to clients yet
4 年前
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 年前
a81b6769
first pass at action system work
4 年前
7f913178
[TEMP!!] Removing Multipie dependency. Storm Flag doesn't have a good way to get access to this right now (requires custom unity build). We will plan to revert this change (restoring multipie to the package manifest) in January after we've had a chance to sort out our access issues
4 年前
89706c47
Integrated new UI for Title screen and stub for Char Select. Dungeon adjusted to show character lineup.
4 年前
9b0e2a81
Support for animation and spawning player in DungeonTest scene
4 年前
13a7f3fb
taking reverse merge from develop
4 年前
8b6d8e3d
removed existing MLAPI editor code that was fighting with the real MLAPI package code
4 年前
79f4877d
adding another missing package dependency
4 年前
jdepuy
David Woodruff
Luke Stampfli
CGerrits SF
GitHub
eheimburg