Skip to content
This repository was archived by the owner on Oct 4, 2022. It is now read-only.

Commit 07228c6

Browse files
lybuilderlybuilder
lybuilder
authored and
lybuilder
committed
Lumberyard Release 1.22.0.0
Binaries Uncompressed Size: 20.22GB (21711570429 bytes)
1 parent 730eaff commit 07228c6

File tree

4,451 files changed

+300043
-111515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,451 files changed

+300043
-111515
lines changed

.gitignore

-7
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,9 @@
103103
/dev/AssetProcessorTemp
104104
/dev/BinTemp
105105
/dev/Bin64
106-
/dev/Bin64vc120
107-
/dev/Bin64vc120.Debug
108-
/dev/Bin64vc140
109-
/dev/Bin64vc140.Debug
110106
/dev/Bin64vc141
111107
/dev/Bin64vc141.Debug
112108
/dev/Cache
113-
/dev/FeatureTests
114109
/dev/SamplesProject
115110
/dev/Code/SDKs
116111
/dev/Code/Sandbox/SDKs
@@ -125,8 +120,6 @@
125120
/dev/Gems/Substance
126121
/dev/Tools/CrySCompileServer/x64
127122
/dev/Tools/LmbrSetup/Win.vc141.Debug
128-
/dev/Tools/LmbrSetup/Win.vc140.Debug
129-
/dev/Tools/LmbrSetup/Win.vc120.Debug
130123

131124
# Ignore ico files from Lumberyard folders but preserve ico files in project folders
132125
/dev/Code/**/*.ico

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ To make it easy for you to contribute to our game engine, the Lumberyard develop
1818
- When positioning curly braces, open braces on a new line and keep them flush with the outer block's indentation.
1919
- Always use curly braces for flow control statements.
2020
- Each line of code should only include a single statement.
21-
- Naming conventions for classes, functions, types and files should adhere to CamelCase and specify what the function does.
21+
- Naming conventions for classes, functions, types and files should adhere to CamelCase and specify what the function does.
2222
- All header files must include the directive, "#pragma once".
2323
- Use forward declarations to minimize header file dependencies. Compile times are a concern so please put in the effort to minimize include chains.
2424
- The following syntax should be used when including header files: #include <Package/SubdirectoryChain/Header.h>

bootstrap_config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Checksum": "c7ab91661cff63e54d0fd1d754a94b7b4b4e3c0f1b4be676d06d2143ff35488f92599404f4d8330d0767354b0687cdc072500f2efc560edd16d60463b98501de",
3-
"URL": "https://d3dn1rjl3s1m7l.cloudfront.net/1.21.2.0/lumberyard-1.21-989844a-pc_103019_110531-binaries.zip",
4-
"Uncompressed Size": 23292961137
2+
"Checksum": "8da2b67c6afb8b24a9816ef1e6d7adc6da0ed7d705717f402590a606158a45665cce729616bcd9ba19e44840d0fdeff0e819fafdc87a173afdf503dd427a8039",
3+
"URL": "https://d3dn1rjl3s1m7l.cloudfront.net/1.22.0.0/lumberyard-1.22-1017502a-pc_121219_151522-binaries.zip",
4+
"Uncompressed Size": 21711570429
55
}

dev/AssetProcessorPlatformConfig.ini

+24-135
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ tags=mobile,renderer
2929
[Platform osx_gl]
3030
tags=tools,renderer
3131

32-
[Platform xboxone] ; ACCEPTED_USE
32+
[Platform xenia]
3333
tags=console, renderer
3434

35-
[Platform ps4] ; ACCEPTED_USE
35+
[Platform provo]
3636
tags=console,renderer
3737

3838
; this is an example of a headless platform that has no renderer.
@@ -49,8 +49,8 @@ tags=server
4949
;es3=enabled
5050
;ios=enabled
5151
;osx_gl=enabled
52-
;xboxone=enabled
53-
;ps4=enabled
52+
;xenia=enabled
53+
;provo=enabled
5454
;server=enabled
5555

5656
; ---- The number of worker jobs, 0 means use the number of Logical Cores
@@ -223,6 +223,15 @@ pattern=.*\\/ArtSource\\/.*
223223
;params = \\someparams
224224
;ios=skip
225225

226+
; you can specify an option to output product dependencies for a copy job.
227+
; please note that you only need to set this option when cry code is required to parse the asset.
228+
; otherwise product dependencies will be output automatically by the CopyDependencyBuilder.
229+
; for example, if you want to output the product dependencies for font assets:
230+
;[RC font]
231+
;glob=*.font
232+
;params=copy
233+
;outputProductDependencies=true
234+
226235
; you can also specify an option to make all jobs critical that matches some pattern/glob.
227236
; for example, if you want to make all png files critical than set critical to true.
228237
; Note that by default all copy jobs are critical.
@@ -281,11 +290,6 @@ params=copy
281290
productAssetType={6023CFF8-FCBA-4528-A8BF-6E0E10B9AB9C}
282291
; same as above
283292

284-
[RC cld]
285-
glob=*.cld
286-
productAssetType={E043B218-F9EA-4820-AA0A-C5149F0089E8}
287-
params=copy
288-
289293
[RC mp4]
290294
glob=*.mp4
291295
params=copy
@@ -321,19 +325,14 @@ version=2
321325

322326
[RC cgf]
323327
glob=*.cgf
324-
params=/VertexPositionFormat=exporter /VertexIndexFormat=u32 /BuildRNRMesh
328+
params=/VertexPositionFormat=exporter /VertexIndexFormat=u32
325329
; on server, feed rc.exe the param /p=pc to force it to compile assets for server platform in pc format.
326-
server=/VertexPositionFormat=exporter /VertexIndexFormat=u32 /p=pc /BuildRNRMesh
330+
server=/VertexPositionFormat=exporter /VertexIndexFormat=u32 /p=pc
327331
lockSource=true
328332
priority=10
329333
; allow CGF files to compile first, so untextured models appear before their textures for faster startup
330334
; other available params: /SplitLODs=1
331335

332-
[RC vegdescriptorlist]
333-
glob=*.vegdescriptorlist
334-
params=copy
335-
productAssetType={60961B36-E3CA-4877-B197-1462C1363F6E}
336-
337336
[RC surfaceTagNameList]
338337
glob=*.surfaceTagNameList
339338
params=copy
@@ -360,12 +359,6 @@ version=2
360359
glob=*.skin
361360
params=copy
362361

363-
[RC cfg]
364-
glob=*.cfg
365-
params=copy
366-
productAssetType={9952F1E9-BF9F-4B0D-8627-D973A3D82230}
367-
version=2
368-
369362
[RC cfi]
370363
glob=*.cfi
371364
params=copy
@@ -393,15 +386,6 @@ productAssetType={3436C30E-E2C5-4C3B-A7B9-66C94A28701B}
393386
params=skip ; only tools-supporting platforms should copy this file. Everyone else can skip.
394387
tools=copy
395388

396-
[RC anm]
397-
glob=*.anm
398-
params=copy
399-
400-
[RC gfx]
401-
glob=*.gfx
402-
params=copy
403-
server=skip
404-
405389
[RC usm]
406390
glob=*.usm
407391
params=copy
@@ -443,22 +427,6 @@ params=copy
443427
glob=*.dlg
444428
params=copy
445429

446-
[RC ent]
447-
glob=*.ent
448-
params=copy
449-
450-
[RC fsq]
451-
glob=*.fsq
452-
params=copy
453-
454-
[RC fxl]
455-
glob=*.fxl
456-
params=copy
457-
458-
[RC ik]
459-
glob=*.ik
460-
params=copy
461-
462430
[RC csv]
463431
glob=*.csv
464432
params=copy
@@ -485,34 +453,11 @@ version=2
485453
glob=*.sbsar
486454
params=copy
487455

488-
[RC setup]
489-
glob=*.setup
490-
params=copy
491-
492-
[RC xml]
493-
glob=*.xml
494-
params=copy
495-
version=2
496-
497456
[RC loc.agsxml]
498457
glob=*.loc.agsxml
499458
params=copy
500459
version=1
501460

502-
[RC font]
503-
glob=*.font
504-
params=copy
505-
productAssetType={57767D37-0EBE-43BE-8F60-AB36D2056EF8}
506-
server=skip
507-
; above from UiAssetTypes.h
508-
509-
[RC fontfamily]
510-
glob=*.fontfamily
511-
params=copy
512-
productAssetType={57767D37-0EBE-43BE-8F60-AB36D2056EF8}
513-
server=skip
514-
; above from UiAssetTypes.h
515-
516461
[RC Editor Slice Copy]
517462
glob=*.slice
518463
params=copy
@@ -541,30 +486,10 @@ params=copy
541486
glob=*.txt
542487
params=copy
543488

544-
[RC usm]
545-
glob=*.usm
546-
params=copy
547-
548-
[RC bnk]
549-
glob=*.bnk
550-
params=copy
551-
552-
[RC wem]
553-
glob=*.wem
554-
params=copy
555-
556-
[RC fdp]
557-
glob=*.fdp
558-
params=copy
559-
560489
[RC cal]
561490
glob=*.cal
562491
params=copy
563492

564-
[RC grd]
565-
glob=*.grd
566-
params=copy
567-
568493
[RC grp]
569494
glob=*.grp
570495
params=copy
@@ -592,17 +517,14 @@ glob=*.ext
592517
params=copy
593518

594519
[RC pak]
595-
glob=*.pak
520+
; Copy all pak files except level.pak, level.pak has its own builder.
521+
pattern=^((?!\\/level\\.pak).)*\\.pak$
596522
params=copy
597523

598524
[RC ctc]
599525
glob=*.ctc
600526
params=copy
601527

602-
[RC prototype]
603-
glob=*.prototype
604-
params=copy
605-
606528
[RC uiprefab]
607529
glob=*.uiprefab
608530
params=copy
@@ -617,10 +539,6 @@ server=skip
617539
glob=*.bin
618540
params=copy
619541

620-
[RC pssl]
621-
glob=*.pssl
622-
params=copy
623-
624542
[RC inputbindings]
625543
glob=*.inputbindings
626544
params=copy
@@ -646,51 +564,17 @@ server=skip
646564
glob=*.pem
647565
params=copy
648566

649-
[RC Editor Script Canvas]
650-
glob=*.scriptcanvas
651-
params=copy
652-
productAssetType={FA10C3DA-0717-4B72-8944-CD67D13DFA2B}
653-
654-
[RC Runtime Script Canvas]
655-
glob=*.scriptcanvascompiled
656-
params=copy
657-
productAssetType={3E2AC8CD-713F-453E-967F-29517F331784}
658-
critical=true
659-
660567
; Copy over certificates for use with Dynamic Content
661568
[RC CertificateDER]
662569
glob=*.der
663570
params=copy
664571

665572
[RC audio]
666-
pattern=.*\.(wav|mp2|mp3|pcm|ogg)
573+
pattern=.*\.(wav|pcm|ogg)
667574
params=copy
668575
productAssetType={2FC41C35-244B-41D3-A312-B1E222CAE762}
669576
server=skip
670577

671-
[RC EmotionFXMotionSet]
672-
glob=*.motionset
673-
params=copy
674-
productAssetType={1DA936A0-F766-4B2F-B89C-9F4C8E1310F9}
675-
676-
[RC EmotionFXAnimGraph]
677-
glob=*.animgraph
678-
params=copy
679-
productAssetType={28003359-4A29-41AE-8198-0AEFE9FF5263}
680-
681-
[RC PopcornFXParticles]
682-
glob=*.pkfx
683-
params=copy
684-
productAssetType={45047C35-64F7-43BA-B463-000081B587C3}
685-
686-
[RC PopcornFXAtlasDefinition]
687-
glob=*.pkat
688-
params=copy
689-
690-
[RC PopcornFXMesh]
691-
glob=*.pkmm
692-
params=copy
693-
694578
[RC PhysXMeshAsset]
695579
glob=*.pxmesh
696580
params=copy
@@ -700,4 +584,9 @@ productAssetType={7A2871B9-5EAB-4DE0-A901-B0D2C6920DDB}
700584
[RC PhysX HeightField]
701585
glob=*.pxheightfield
702586
params=copy
703-
productAssetType={B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}
587+
productAssetType={B61189FE-B2D7-4AF1-8951-CB5C0F7834FC}
588+
589+
[RC filetag]
590+
glob=*.filetag
591+
params=copy
592+
productAssetType={F3BE5CAB-85B7-44B7-9495-863863F6B267}

0 commit comments

Comments
 (0)