Luke Stampfli
a036713e
Unity project setup
4 年前
Luke Stampfli
c332b364
Simple scene setup; Add Photon ApplicationId
4 年前
GitHub
2304d72b
Experimental/multipie ( #9 )
* feature: Update to 2020.2.0f1
* feature: Add multipie support
4 年前
Luke Stampfli
77d8f673
Add movement replication
4 年前
David Woodruff
5aa6f236
stubs for main menu scene
4 年前
GitHub
475290ca
added leftover assets not yet added to lfs ( #26 )
4 年前
David Woodruff
681b08bc
more feedback fixups
4 年前
David Woodruff
36fa2ccc
taking merge1
4 年前
David Woodruff
966b103d
redoing state machine pattern. It now uses prefabs to model states.
4 年前
David Woodruff
d121afca
taking merge 2
4 年前
David Woodruff
941f2760
integration changes needed to make my work work with Luke's. GameNetHub now follows a listener pattern like other networked components, so avoid any reverse dependencies of shared logic on client/server code.
4 年前
David Woodruff
6a6ac7b6
taking mainmenu changes
4 年前
David Woodruff
64008746
adding stormflag art assets and test scene
4 年前
David Woodruff
8b6d8e3d
removed existing MLAPI editor code that was fighting with the real MLAPI package code
4 年前
David Woodruff
13a7f3fb
taking reverse merge from develop
4 年前
eheimburg
e96bb41c
Merge remote-tracking branch 'origin/sfdev' into eh_integratecharacterset
4 年前
David Woodruff
6866f803
cleaning up some empty methods
4 年前
David Woodruff
4c4f0cfb
taking sfdev merge
4 年前
GitHub
3cc6f6be
Merge pull request #18 from Unity-Technologies/dmw_actionsystem
Action System V1
4 年前
David Woodruff
f6b9a66a
got hit action working with basic physics detection. Added stub for characters dying--right now they just instantly destroy themselves
4 年前
GitHub
3d9bcf77
Merge pull request #22 from Unity-Technologies/dmw_hitaction
physics-based melee hit action
4 年前
David Woodruff
8c65ea88
taking develop merge
4 年前
David Woodruff
4e0d4420
taking feedback from holiday PRs
4 年前
jdepuy
ebc9ae60
Adjusted Main menu so it stretches and the font for text input is higher rez. Rendering path is now set to Deferred
4 年前
jdepuy
ca2318ea
Added imp enemy to character lineup. Updated Boss with his own animation controller and replaced old boss prefab with new one that now has the cape rigged and animated
4 年前
GitHub
1fc1cdf0
Merge pull request #28 from Unity-Technologies/jdp_br_ui
Adjusted main menu so it stretches and the font for text input is higher rez. Rendering path is now set to Deferred
4 年前
GitHub
219d40db
Merge pull request #31 from Unity-Technologies/jdp_bb_art
Added imp enemy to character lineup. Updated Boss with his own animation controller and replaced old boss prefab with new one that now has the cape rigged and animated
4 年前
David Woodruff
95ccb450
taking origin merge
4 年前
Luke Stampfli
aafae870
feat: Update existing scenes and fix nav meshes
4 年前
David Woodruff
93cc4c2e
taking merge
4 年前
GitHub
758dc87d
Merge pull request #33 from Unity-Technologies/sfdev
taking sfdev to develop
4 年前
CGerrits SF
38d4837d
merge with sfdev
4 年前
jdepuy
59457d08
Switched the lighting to a Linear color space. This of course required the adjustment of the textures, shaders, lighting, and post processing to get the scene to look normal. We can now confidently improve the lighting solution and work on polishing the textures and shaders
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 年前
GitHub
99c7f2fe
Merge pull request #36 from Unity-Technologies/jdp_br_art
Switched the lighting to a Linear color space..
4 年前
GitHub
d4a3dbbf
Character health system ( #34 )
This PR implements full character lifecycle with the following states:
Alive
Fainted - PCs go into this state upon reaching 0 HP
Dead - NPCs just die
Along with these states ReviveAction has been added, which restores a Fainted character back to life.
Player inputs now differentiate between friends and foes and tries to revive fainted allies on right click.
Commits have been arranged in a readable order and contain additional implementation details.
4 年前
JS Fauteux
367549e0
Merge branch 'develop' into feature/multipie_integration
4 年前
sorcerer_king
c5c7aae2
LFS is terrorising me
I can't seem to be able to get rid of assets that need to be pointers, but aren't - it completely disrupts any work, so I'll just bite the bullet and check them in.
4 年前
GitHub
9909f731
Update to Dungeon layout including beginnings of Boss Area. ( #39 )
Update to Dungeon layout including beginnings of Boss Area. Also, Interactive objects stubbed out. Additional tile pieces created. Arrow FX model added.
4 年前