eheimburg
|
e96bb41c
|
Merge remote-tracking branch 'origin/sfdev' into eh_integratecharacterset
|
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 年前 |
David Woodruff
|
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 年前 |
jdepuy
|
89706c47
|
Integrated new UI for Title screen and stub for Char Select. Dungeon adjusted to show character lineup.
|
4 年前 |
|
eheimburg
|
9b0e2a81
|
Support for animation and spawning player in DungeonTest scene
|
4 年前 |
|
David Woodruff
|
13a7f3fb
|
taking reverse merge from develop
|
4 年前 |
|
David Woodruff
|
8b6d8e3d
|
removed existing MLAPI editor code that was fighting with the real MLAPI package code
|
4 年前 |
|
David Woodruff
|
79f4877d
|
adding another missing package dependency
|
4 年前 |
|
David Woodruff
|
64008746
|
adding stormflag art assets and test scene
|
4 年前 |
|
David Woodruff
|
6a6ac7b6
|
taking mainmenu changes
|
4 年前 |
|
David Woodruff
|
c7be0c6b
|
Merge branch 'dmw_lfsfilters' into sfdev
|
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
|
4b8e4bd1
|
moving assets to BossRoom root dir
|
4 年前 |
|
David Woodruff
|
d121afca
|
taking merge 2
|
4 年前 |
|
David Woodruff
|
95662b7d
|
doing some namespace normalization
|
4 年前 |
|
David Woodruff
|
65abb54f
|
removing stray scripts from initial-setup branch, and removing SampleScene which has been moved, and thus duplicated by this merge
|
4 年前 |
|
David Woodruff
|
966b103d
|
redoing state machine pattern. It now uses prefabs to model states.
|
4 年前 |
|
David Woodruff
|
36fa2ccc
|
taking merge1
|
4 年前 |
|
David Woodruff
|
681b08bc
|
more feedback fixups
|
4 年前 |
|
David Woodruff
|
71e86f34
|
progress on taking review feedback
|
4 年前 |
|
David Woodruff
|
31d04aa4
|
getting things working after taking develop merge. The MLAPI dependency was unhappy. I've changed the path to something that doesn't 404 for me, and updated the commit hash to the current head of the develop branch (in the mlapi repo)
|
4 年前 |
|
David Woodruff
|
ccbe1020
|
taking develop merge
|
4 年前 |
|
David Woodruff
|
9e79b033
|
trailing commit for main menu scene
|
4 年前 |
|
David Woodruff
|
51fa5d4c
|
removing unneeded kludge for getting NetworkingManagerGO
|
4 年前 |
|
David Woodruff
|
79a7841c
|
fixing issue causing blank IPs to not work
|
4 年前 |
Luke Stampfli
|
982d803e
|
docs: Add comments.
|
4 年前 |
|
David Woodruff
|
e9032e85
|
can now connect to remote host and switch to his scene
|
4 年前 |
|
Luke Stampfli
|
0a009825
|
refactor: Rename ClientInputSender
|
4 年前 |
|
David Woodruff
|
bc9bfd75
|
more progress on core scene switching framework
|
4 年前 |
|
Luke Stampfli
|
e7d31100
|
refactor: Add tasks to TODOs and add comments
|
4 年前 |
|
GitHub
|
3565f53e
|
Merge pull request #14 from Unity-Technologies/master
Merge develop into master
|
4 年前 |
|
David Woodruff
|
5aa6f236
|
stubs for main menu scene
|
4 年前 |
|
Luke Stampfli
|
77b59d92
|
refactor: update namespaces
|
4 年前 |
|
GitHub
|
b192efad
|
Character spawning and simple input handling and positon replication (#5)
* Character spawning and simple input handling and positon replication
* fix: fix prefab component layout
* refactor: Add asmdef files
* refactor: update namespaces
* refactor: Add tasks to TODOs and add comments
* refactor: Rename ClientInputSender
* docs: Add comments.
* refactor: Instance field naming follow Unity conventions, TODOs reference Jira tasks.
|
4 年前 |
|
Luke Stampfli
|
1722716e
|
refactor: Add asmdef files
|
4 年前 |
|
GitHub
|
b3020972
|
Merge pull request #8 from Unity-Technologies/dmw_lfsfilters
adding starting set of git lfs filters
|
4 年前 |
|
David Woodruff
|
29601333
|
updating with Fernando's suggestions
|
4 年前 |
|
Luke Stampfli
|
1a0d968e
|
fix: fix prefab component layout
|
4 年前 |
|
David Woodruff
|
c70f80bd
|
adding starting set of git lfs filters
|
4 年前 |
|
Luke Stampfli
|
8a9b8d9b
|
Character spawning and simple input handling and positon replication
|
4 年前 |
|
GitHub
|
2304d72b
|
Experimental/multipie (#9)
* feature: Update to 2020.2.0f1
* feature: Add multipie support
|
4 年前 |
|
GitHub
|
d13e7316
|
Update mlapi package remote url to internal mlapi repository. (#4)
* Update mlapi package remote url to internal mlapi repository.
* Track public develop branch for MLAPI instead
|
4 年前 |
|
Luke Stampfli
|
f8f0859f
|
Remove unecessary target assignment.
|
4 年前 |
|
Luke Stampfli
|
77d8f673
|
Add movement replication
|
4 年前 |
|
Luke Stampfli
|
5430c156
|
Add NetworkingManager HUD
|
4 年前 |
|
Luke Stampfli
|
208a3a8a
|
Host mode movement and interpolation (no networking sync yet)
|
4 年前 |
|
Luke Stampfli
|
c332b364
|
Simple scene setup; Add Photon ApplicationId
|
4 年前 |
|
GitHub
|
55e5f0a5
|
Merge pull request #2 from Unity-Technologies/feature/networkingmanager-hud
Add NetworkingManagerHUD
|
4 年前 |
|
Luke Stampfli
|
3e08e7ff
|
Add Photon Realtime transport
|
4 年前 |
|
GitHub
|
6e33fb21
|
Merge pull request #3 from Unity-Technologies/feature/LiteNetLibTransport
Add LiteNetLibTransport
|
4 年前 |
