Skip to content

Commit

Permalink
Merge pull request #1 from nievesj/develop
Browse files Browse the repository at this point in the history
Updating Core example with the latest fixes form the private version.
  • Loading branch information
nievesj authored Dec 5, 2019
2 parents 669f846 + eda3662 commit 111f88c
Show file tree
Hide file tree
Showing 2,149 changed files with 72,373 additions and 34,512 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
ManifestFileVersion: 0
CRC: 4056895222
AssetBundleManifest:
AssetBundleInfos:
Info_0:
Name: ui/uishowoffwindowhud
Dependencies: {}
Info_1:
Name: ui/poolwidget
Dependencies: {}
Info_2:
Name: levels/coredemolevel
Dependencies: {}
Info_3:
Name: prefabs/ball
Dependencies: {}
Info_4:
Name: ui/topwindow
Dependencies: {}
Info_5:
Name: ui/rightwindow
Dependencies: {}
Info_6:
Name: ui/uititlescreenwindow
Dependencies: {}
Info_7:
Name: ui/bottomwindow
Dependencies: {}
Binary file not shown.
34 changes: 34 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/levels/coredemolevel.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
ManifestFileVersion: 0
CRC: 1523466125
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 1c68f75eeb28db4e23f7dde4ec175e48
TypeTreeHash:
serializedVersion: 2
Hash: 9022c9632b84ef6ba5c977026cf042b5
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 65
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: c62222dcf99844dd781f3c4af9ed588a, type: 3}
- Class: 115
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/Levels/CoreDemoLevel.prefab
Dependencies: []
Binary file added AssetBundles/StandaloneOSXUniversal/prefabs/ball
Binary file not shown.
42 changes: 42 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/prefabs/ball.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
ManifestFileVersion: 0
CRC: 3721625915
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 0b5572e253242a4cbca1b7e830d07c38
TypeTreeHash:
serializedVersion: 2
Hash: 1a3f7c5a568a50f9a9ec45543f1922df
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 54
Script: {instanceID: 0}
- Class: 108
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: e00bebbba18d1439aa92b4f189883059, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 134
Script: {instanceID: 0}
- Class: 135
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/Game/Ball.prefab
Dependencies: []
Binary file not shown.
40 changes: 40 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/ui/bottomwindow.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ManifestFileVersion: 0
CRC: 2531813982
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: bf7cad80b29d2429eb79786b8bae10ba
TypeTreeHash:
serializedVersion: 2
Hash: 8bafd944973eac5eebf9c66a2f069062
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 11c04a7e181debb4f8a5d8659fc6a89c, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/BottomWindow.prefab
Dependencies: []
Binary file added AssetBundles/StandaloneOSXUniversal/ui/poolwidget
Binary file not shown.
38 changes: 38 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/ui/poolwidget.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
ManifestFileVersion: 0
CRC: 1909980512
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: a37d448a7d5591df187a3d562854dbf1
TypeTreeHash:
serializedVersion: 2
Hash: d4eb55dd79ba5d32cb1cc063427073bf
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: d814051d3757a194893ea491b6aef438, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/PoolWidget.prefab
Dependencies: []
Binary file not shown.
40 changes: 40 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/ui/rightwindow.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ManifestFileVersion: 0
CRC: 2944173865
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 13ce4f479e5384c50ce69b19a751bcf0
TypeTreeHash:
serializedVersion: 2
Hash: 8bafd944973eac5eebf9c66a2f069062
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 11c04a7e181debb4f8a5d8659fc6a89c, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/RightWindow.prefab
Dependencies: []
Binary file added AssetBundles/StandaloneOSXUniversal/ui/topwindow
Binary file not shown.
40 changes: 40 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/ui/topwindow.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ManifestFileVersion: 0
CRC: 1307652346
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 800e3748e9c34f3f81649ebc1d1a11bd
TypeTreeHash:
serializedVersion: 2
Hash: 8bafd944973eac5eebf9c66a2f069062
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 11c04a7e181debb4f8a5d8659fc6a89c, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/TopWindow.prefab
Dependencies: []
Binary file not shown.
42 changes: 42 additions & 0 deletions AssetBundles/StandaloneOSXUniversal/ui/uishowoffwindowhud.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
ManifestFileVersion: 0
CRC: 2670896910
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: af455a2fca9bb415ce90435337553eed
TypeTreeHash:
serializedVersion: 2
Hash: e8cb7239759ae0c084d902bfcdc55a67
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 9fdf3bd2c4e60450ab21aa428cfa859f, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/UIShowOffWindowHud.prefab
Dependencies: []
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
ManifestFileVersion: 0
CRC: 1599074952
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: 30d92fd9e9134416d0bbd4922dcdfc4d
TypeTreeHash:
serializedVersion: 2
Hash: e5c8ebbb578f7dca8d189fab4b4bab61
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: d31ab23e639ba4c0784bbac43be7d3e1, type: 3}
- Class: 115
Script: {instanceID: 0}
- Class: 128
Script: {instanceID: 0}
- Class: 213
Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 224
Script: {instanceID: 0}
Assets:
- Assets/Prefabs/UI/UITitleScreenWindow.prefab
Dependencies: []
File renamed without changes.
17 changes: 17 additions & 0 deletions Assets/Code/Code.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "Code",
"references": [
"GUID:dca723afad1173e4db17bbe6e722fe6a",
"GUID:0d8beb7f090555447a6cf5ce9e54dbb4",
"GUID:560b04d1a97f54a4e82edc0cbbb69285",
"GUID:f51ebe6a0ceec4240a699833d6309b23"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
"versionDefines": []
}
7 changes: 7 additions & 0 deletions Assets/Code/Code.asmdef.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
Loading

0 comments on commit 111f88c

Please sign in to comment.