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

169 Commits

Author SHA1 Message Date
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
puvvadar 528df7fad2 Merge branch 'main' into mp_serialize_vector 2021-05-26 20:07:58 -07:00
puvvadar ab0a1cee2f Fix inadvertent redefine in Test 2021-05-26 15:33:10 -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
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
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
puvvadar e47fb1b7ea Fix outdated Rewindable vector jinja generation 2021-05-25 14:21:14 -07:00
puvvadar 6d9dd587ee Revert change to LocalPrediction xml 2021-05-25 14:17:25 -07:00
puvvadar 7129cad1ce Add RewindableFixedVector and update jinja components to use it 2021-05-25 14:12:47 -07:00
pereslav 43ffb2c872 SPEC-6984 Fixed flaky test when user settings were written by ComponentApplication 2021-05-24 19:51:16 +01:00
puvvadar a7c41064a4 Update fixed_vector autogen to account for IsRewindable 2021-05-21 17:01:10 -07:00
Gene Walters d948bf0a77 Moved network context methods out of MultiplayerComponent into NetBindingComponent because FindComponent did not actually work with finding base classes. +1 for the ability to test! Allow scripting to detect if a networked entity is Authory, Server, Client, or Autonomous. 2021-05-20 22:48:04 -07:00
karlberg 3dd40171cd Merging latest origin 2021-05-20 17:08:18 -07:00
AMZN-puvvadar fd3927651b Merge pull request #840 from aws-lumberyard-dev/mpgem_scripting_rpc 
Add events for MP Gem RPCs plus BC reflection so ScriptCanvas can respond to them
 2021-05-20 15:58:29 -07:00
lawsonamzn e886dba77e Update Multiplayer gem to conform to the new standard 
The multiplayer gem had a naming conflict in it - a module was called
"Tools".
 2021-05-20 15:27:54 -07:00
Gene Walters d656afa1c3 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas 2021-05-20 14:03:39 -07:00
pereslav cb87b7cd1f Moved early return case in prefab processing 2021-05-20 19:43:33 +01:00
puvvadar d26d24d9bd Remove test RTTIs 2021-05-20 11:38:06 -07:00
lawsonamzn 6a7a86062e Updates AutomatedTesting project and adds atom support 2021-05-20 10:48:50 -07:00
Nicholas Lawson c9d5d7fb77 The new gem registration and usage system 
Merge from mainline (Rebase)
 2021-05-20 10:47:03 -07:00
puvvadar 7ecb00cca1 Cleanup jinja formatting and fix log spam 2021-05-20 10:46:48 -07:00
pereslav 43d98ac989 Fixed comment 2021-05-20 16:56:54 +01:00
pereslav 22e893ccbe Added support for nested prefabs in multiplayer pipeline 2021-05-20 16:32:41 +01:00
puvvadar 2452149e7d Add RPC Events plus reflection plus fix Ctrl+G retry 2021-05-19 19:34:48 -07:00
Gene Walters f61b9c4081 Removing spaces in behavior context method names. While whitespace works in Lua and ScriptCanvas, the Scripting team wants to keep the script API and code API consistent (ie: no spaces) 2021-05-19 16:03:13 -07:00
karlberg 6a643392f0 Merging latest main 2021-05-19 13:37:45 -07:00
karlberg 487e989e68 Several updates to complete rewind support and remove unneeded functionality 2021-05-19 13:27:24 -07:00
Gene Walters f7dfbd3955 Merge branch 'main' into SPEC6477_NetworkContextScriptCanvas 2021-05-18 16:46:51 -07:00
puvvadar e4808751f9 Merge branch 'main' into mpgem_scripting_rpc 2021-05-18 16:38:30 -07:00
AMZN-puvvadar 29b4ab6ff3 Merge pull request #522 from aws-lumberyard-dev/mp_editor_pipeline 
Integrating network prefab processing with Multiplayer.Editor to enable server launch on Ctrl+G via an Editor specific network connection
 2021-05-18 16:28:08 -07:00
puvvadar 350e5a0cd2 Update to const auto& 2021-05-18 15:22:22 -07:00
Gene Walters 0d207eab19 fixes minor auto-formatting issue 2021-05-18 14:27:17 -07:00
Gene Walters c4641f2594 ScriptCanvas can now check if an entity net-component is authority, autonomous, server, or client 2021-05-18 14:13:01 -07:00
puvvadar e2ade654fb Address misc feedback 2021-05-18 13:52:28 -07:00
puvvadar f087b3be89 AutoComponent jinja formatting 2021-05-18 12:13:03 -07:00
puvvadar e03645f816 Disable editorsv launch by default 2021-05-18 10:48:39 -07:00
puvvadar 19316e422b Check launch process exists before waiting for 15 seconds 2021-05-18 10:46:18 -07:00
pereslav f721aa511f Fixed entity IDs of the original & networked spawnables 2021-05-18 17:15:24 +01:00
pereslav b821a3a12d Fixed build 2021-05-18 14:00:41 +01:00
pereslav 85374ea7fc Merged from main 2021-05-18 13:10:44 +01:00