8e86623ee6
Fixed compile issue from merge error
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 13:13:17 -05:00
d7574777a8
Resolved merge conflicts
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-02 12:42:44 -05:00
a02ecefab9
short term fix for editor/game mode/launcher tick times consistency ( #1720 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-01 14:47:51 +01:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
d14229c67e
some replacements and fixes that were referring Sandbox/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 13:55:32 -07:00
e34e36cb35
git mv Code\Sandbox\Editor Code/Editor
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-29 13:55:28 -07:00
Chris Galvan
amzn-sean
Steve Pham
Esteban Papp