birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,973 Commits 3 Branches 3 Tags
e340f3ca5601ccafa0c6bfee04dcd8af83a911cb
Commit Graph

204 Commits

Author SHA1 Message Date
AMZN-puvvadar e340f3ca56 Merge pull request #1102 from aws-lumberyard-dev/MultiplayerPipeline 
Fixed ctrl+g port number
 2021-06-03 08:50:29 -07:00
karlberg afeea87862 Fix for linux being a banned keyword 2021-06-02 19:21:39 -07:00
pereslav bffb7d1b28 Simplified the change to rely on sv_port cvar 2021-06-03 01:20:22 +01:00
pereslav 3b519c6475 removed whitespace 2021-06-03 01:06:15 +01:00
pereslav c752b9d0fc Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts 2021-06-03 01:04:01 +01:00
karlberg 38853eb2c2 Linux build fix 2021-06-02 15:34:35 -07:00
karlberg 82f9d08cfd Build fix for uniform scale changes 2021-06-02 15:21:43 -07:00
karlberg 14bc0ba8ac Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-06-02 14:57:00 -07:00
karlberg b013d7ac67 Minor cleanup 2021-06-02 14:53:33 -07:00
karlberg 8ef2bd7518 Turn off desync debug by default, as this explodes network input sizes 2021-06-02 14:47:05 -07:00
karlberg a69db3bf76 Converts physx console commands from cry console to az console, fixes some bugs in the multiplayer gem 2021-06-02 14:44:02 -07:00
AMZN-koppersr c0dade8883 Merge branch 'main' into SpawnablePriorityQueue 2021-06-01 09:57:27 -07:00
Gene Walters 1a01a876a2 Merge branch 'main' into Multiplayer_AutonomousPropertiesUpdate 2021-05-29 16:01:33 -07:00
Gene Walters fe913f310d Merge pull request #904 from aws-lumberyard-dev/SPEC6989_MultiplayerHostPlayerShouldBeMarkedAutonomous 
Host's Default Player NetBinding will be Autonomous on the Host
 2021-05-29 15:58:01 -07:00
AMZN-puvvadar 61fde9cb7f Merge pull request #1016 from aws-lumberyard-dev/mp_reflect_containers 
Fixes for MP Gem container scripting and non-rewindable containers
 2021-05-28 14:05:45 -07:00
Esteban Papp ff9a052ce6 Merge pull request #1011 from aws-lumberyard-dev/ly-as-sdk/LYN-2948 
Integration of the LY as an SDK work
 2021-05-28 11:30:13 -07:00
puvvadar 17f85be9b5 Switch size check to empty 2021-05-28 11:00:54 -07:00
pereslav 090234f1f0 Merge branch 'main' into MultiplayerPipeline 2021-05-28 16:00:09 +01:00
pereslav 42b3e3817a SPEC-7012 Added rewind-aware scene query utilities. Added frame ID to SimulatedBody 2021-05-28 15:50:02 +01:00
Gene Walters 0f258954fb Fix for unit test. Checking that AssetManager is ready before spawning entities; MultiplayerSystemComponent will attempt to spawn a default player on init(), but during unit tests the AssetManager isn't stood up 2021-05-27 22:29:40 -07:00
karlberg e737307168 Merging latest origin/main 2021-05-27 20:00:54 -07:00
karlberg 802943bbb3 Bug fixes, naming changes to make variables more clear, and adds a cvar to adjust client window size 2021-05-27 19:54:56 -07:00
Gene Walters 98d9ee44fd Merge branch 'main' into SPEC6989_MultiplayerHostPlayerShouldBeMarkedAutonomous 2021-05-27 19:04:17 -07:00
puvvadar 4d2e453b73 Cleanup flow of logic in serialization 2021-05-27 16:53:53 -07:00
AMZN-koppersr d4ce2849c7 Post-merge fixup. 2021-05-27 16:46:33 -07:00
puvvadar 0c6af23652 Correct numeric cast 2021-05-27 16:27:26 -07:00
puvvadar 291e27a381 Correct numeric cast 2021-05-27 16:26:26 -07:00
puvvadar f007efbc36 Fix various container issues in jinja 2021-05-27 16:01:57 -07:00
pappeste 01933f45b1 Merge branch 'main' into ly-as-sdk/LYN-2948 
# Conflicts:
#	Gems/AtomLyIntegration/TechnicalArt/DccScriptingInterface/gem.json
 2021-05-27 10:39:37 -07:00
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948 
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
 2021-05-27 10:29:19 -07:00
Gene Walters c746b9939b Merge branch 'main' into SPEC6989_MultiplayerHostPlayerShouldBeMarkedAutonomous 2021-05-27 09:02:58 -07:00
puvvadar 528df7fad2 Merge branch 'main' into mp_serialize_vector 2021-05-26 20:07:58 -07:00
Gene Walters 7a16ef31f5 Merge branch 'SPEC6989_MultiplayerHostPlayerShouldBeMarkedAutonomous' into Multiplayer_AutonomousPropertiesUpdate 2021-05-26 16:31:22 -07:00
puvvadar ab0a1cee2f Fix inadvertent redefine in Test 2021-05-26 15:33:10 -07:00
Gene Walters 09dd298a8d Merge branch 'main' into Multiplayer_AutonomousPropertiesUpdate 2021-05-26 15:24:05 -07:00
puvvadar 023dce00ff Fix syntax error in RewindableArray 2021-05-26 14:19:54 -07:00
puvvadar 9103135275 Add iterator test for RewindableFixedVector 2021-05-26 14:14:46 -07:00
puvvadar 95963aa198 Update iterators to account for rewindable size 2021-05-26 14:11:09 -07:00
puvvadar 7830955680 Add units for Rewindable containers and rework RewindableFixedVector to properly handle rewinding 2021-05-26 13:45:12 -07:00
Gene Walters 05a0e063a2 Also making Auton->Auth Getters requiring controller 2021-05-26 10:38:04 -07:00
greerdv c0546c27f7 change default scale to 1 2021-05-26 16:21:56 +01:00
greerdv 4018bb587c update network code to use uniform scale on Transform 2021-05-26 14:20:22 +01:00
lumberyard-employee-dm 4652d47fb3 Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere 2021-05-26 00:38:51 -05:00
Gene Walters 0fc9697e49 Allow Autonomous->Auth properties. Remove the ability of accessing properties Getters from the Component when ReplicateTo is Autonomous; in this case users must be using the controller to Get 2021-05-25 19:56:18 -07:00
Gene Walters b5a0df00e1 Hosts which are not a dedicated server (meaning they also play the game) will spawn a default player for themselves 2021-05-25 17:21:03 -07:00
puvvadar b256b737a8 Add IBitset include 2021-05-25 16:52:17 -07:00
puvvadar 6559b4c5a9 Cleanup extraneous includes in Rewindable headers 2021-05-25 16:45:45 -07:00
puvvadar d2797c0d15 Add RewindableArray and cleanup a bit more of vector 2021-05-25 16:40:58 -07:00
puvvadar 50b9233552 Cleanup rewind concerns by basing around m_rewindableSize 2021-05-25 16:03:53 -07:00
puvvadar 050574715a Address various feedback around RewindableFixedVector 2021-05-25 15:38:13 -07:00