birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,623 Commits 3 Branches 3 Tags
f03df3e546277c278bd514bdecc06c3117c773a5
Commit Graph

18 Commits

Author SHA1 Message Date
chcurran 3ad8f0dbf9 adjust location of disabling SC unit tests on Linux 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 13:20:08 -07:00
chcurran 6f07a0b136 Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development 2021-07-26 11:32:12 -07:00
chcurran a87318c52a temporarily disable SC unit tests on Linux until a file case issue is solved 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-26 11:31:34 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07:00
lumberyard-employee-dm 3be4c9a393 Removing extra whitespace from the ScriptCanvas Node Library files 
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-07-07 16:33:16 -05:00
chcurran 0a910a31aa The Great ScriptCanvas Purge, Part V 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-06 15:05:37 -07:00
chcurran fa7accf2dc Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing 2021-07-06 07:27:29 -07:00
chcurran 88c328c6e2 The Great ScriptCanvas Purge, Part III 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 17:50:56 -07:00
chcurran fea83b0b51 The Great ScriptCanvas Purge, Part II 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 17:08:16 -07:00
chcurran 59ff74f559 The Great ScriptCanvas Purge. Part I. 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-07-01 09:57:36 -07:00
chcurran 2281330a7c merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 20:42:41 -07:00
Steve Pham 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
chcurran dcb3c71d33 Initial prefab integration 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-29 13:25:56 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
alexpete 1044dc3da1 Integrating github/staging through commit ab87ed9 2021-04-09 11:27:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00
alexpete a10351f38d Initial commit 2021-03-08 14:30:57 -08:00