Skip to content

Commit

Permalink
Fix Build and Publish
Browse files Browse the repository at this point in the history
Note: Build is still broken for Linux, but that's because of CSoundUnity which isn't used, so just remove that package.
  • Loading branch information
Dreaming381 committed Mar 4, 2021
1 parent b50cdb2 commit e1766bc
Show file tree
Hide file tree
Showing 9 changed files with 52 additions and 13 deletions.
20 changes: 20 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
MIT License

Copyright (c) 2021 Dreaming381

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ protected override void OnUpdate()
{
if (sys is GameObjectConversionConfigurationSystem config)
{
#if UNITY_EDITOR
config.Enabled = config.ShouldRunConversionSystem();
#else
config.Enabled = true;
#endif
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,9 @@ internal ParallelWriter(UnsafeParallelBlockList* blockList, void* state)
m_blockList = blockList;
m_state = (State*)state;
m_ThreadIndex = 0;
m_Safety = default;
#if ENABLE_UNITY_COLLECTIONS_CHECKS
m_Safety = default;
#endif
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,9 @@ internal ParallelWriter(UnsafeParallelBlockList* prefabSortkeyBlockList, UnsafeP
m_componentDataBlockList = componentDataBlockList;
m_state = (State*)state;
m_ThreadIndex = 0;
m_Safety = default;
#if ENABLE_UNITY_COLLECTIONS_CHECKS
m_Safety = default;
#endif
}

public void Add<T0>(Entity prefab, T0 c0, int sortKey) where T0 : unmanaged
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/HDRPProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ MonoBehaviour:
m_DefaultDXRScenePrefabSaved: {fileID: 4893056312182120781, guid: a1dfdae16e0448542a6124642d4c13e9, type: 3}
m_ProjectSettingFolderPath: HDRPDefaultResources
m_WizardPopupAtStart: 1
m_WizardPopupAlreadyShownOnce: 1
m_WizardPopupAlreadyShownOnce: 0
m_WizardActiveTab: 0
m_WizardNeedRestartAfterChangingToDX12: 0
m_WizardNeedToRunFixAllAgainAfterDomainReload: 0
Expand Down
6 changes: 6 additions & 0 deletions ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,13 @@ PlayerSettings:
switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
switchNVNMaxPublicTextureIDCount: 0
switchNVNMaxPublicSamplerIDCount: 0
stadiaPresentMode: 0
stadiaTargetFramerate: 0
vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
vulkanEnableLateAcquireNextImage: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1
Expand Down Expand Up @@ -498,6 +501,7 @@ PlayerSettings:
ps4ShareFilePath:
ps4ShareOverlayImagePath:
ps4PrivacyGuardImagePath:
ps4ExtraSceSysFile:
ps4NPtitleDatPath:
ps4RemotePlayKeyAssignment: -1
ps4RemotePlayKeyMappingDir:
Expand Down Expand Up @@ -540,6 +544,8 @@ PlayerSettings:
ps4disableAutoHideSplash: 0
ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0
ps4CompatibilityPS5: 0
ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules:
- libc.prx
Expand Down
23 changes: 14 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ out!
You can download the latest binary version of the game here:
<https://dreaming381.itch.io/lsss>

## Getting Started

The entry scene is called Title and Menu in the Scenes folder. From there you
will be able to enter playmode. The game will use a gamepad as input if a
gamepad is detected. Otherwise it will fall back to mouse and keyboard controls.

## Special Project Restrictions

All assets in the game can be modified either directly in Unity (free UPM
Expand All @@ -23,8 +29,9 @@ Currently, meshes are procedurally generated from built-in primitives. All
texturing is done procedurally using ShaderGraph. Sound Effects are generated
from USFXR and music is composed using CSound.

In stark contrast to my usual style, this game has no intention to establish any
significant lore or storyline. However, feel free to contribute your own!
In stark contrast to my usual style, I have no intention to establish any
significant lore or storyline. However, feel free to contribute your own! The
contributions in the 0.3 version were amazing and I hope to see more!

## Contributing

Expand All @@ -42,12 +49,9 @@ faction with its own kind of ships.
There are a few planned aspects not present in these scenes:

- Interiors for spawn graphics

- Asteroid fields

- Space stations (provide spatial reference and interconnected hangars for
interior combat)

- Lighting

### Code
Expand All @@ -57,7 +61,6 @@ aspects people can dare try to contribute to:

- Editor Tools (I suck at writing these. If you don't suck at them, I envy
your skills!)

- Advanced AI (I have a basic AI in place which I will continue to develop.
However, a faction could use a different AI instead. The only requirement to
an AI is it needs to write to \`ShipDesiredActions\`. Feel free to add any
Expand All @@ -71,12 +74,14 @@ can clean up your branch for you.

## License

This project is licensed under the same licenses which govern the
Latios-Framework repository:
<https://github.com/Dreaming381/Latios-Framework/blob/master/LICENSE.md>
This project is licensed under the MIT license.

## Third Party Notices

This project includes an embedded version of the Latios Framework which is
licensed under the Unity Companion License as a derivative work:
<https://github.com/Dreaming381/Latios-Framework/blob/master/LICENSE.md>

This project includes CSoundUnity via UPM which is licensed under LGPL 2.1.

This project includes USFXR via UPM which is licensed under Apache License 2.0.
Binary file added THIRD_PARTY_NOTICES.md
Binary file not shown.
2 changes: 1 addition & 1 deletion UserSettings/EditorUserSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EditorUserSettings:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0ffb0e1e380cafbf2c3adc18e9cd285a2908b82e6859c8395949c9483d58a8a97ddbd90eed2a5a892a2af949aa48bafb19f85bd75a7ed3a7d25658598b7b58bb4b76aaf777690ca2863946c72c6cd81b6b6708f9f879f88769589d91c8f888e64d20f935e796571755c6b546677696a486c781c073d6f23696429450074652134203e56454c514e4352305f78621c1e6a730c0c00615e4e54185d4f1e4e1b0d587b796d5e6f603a6b7c4172785978363451721033f32331f10126e3f33cec2cdee7f607b25924b2eeb5a25b545c4840414be45198914c4c8c970bd4
flags: 0
unity-properties__ui-persistent-state:
value: 183b144645154b7d0202082d05376c0417031d6876681d5a6d695d73a2a07478f98d76a9a77a7f7c7942af7c447e4314f7134b51b6465b5e495bac5f43ac454b5daf58855a885f5c8b595c8e8d5d93d5d4dac1ef9ab1a7cccccaa598b4b0aeb8b5b1e5bbb7e49680eaefbef1ef8287dfab8af7848c868987fa929193fe91f9d6c094df9694d6818f89daf4d4f7c5f0e8f9e1e4d6d5e5d9ebdddedcf220f199616a726df8e6f8a292a8bc07c33230c4c83237c6643be0cfccc9d23fccd4ce8ae502dad9db06dbdadb21de0dde2364657a230f28183b013b3c0c3d350708396d196566643a683b37686e6f700206767f44504477117a2c5e453f550e417f121714111a1a18361619174a6261634e384863696655666957686b695d705f19e52e76b97179b7bc61b96cb8bebf57a14f55b0b6b7b84a4c4846504d49bd51f4c1180dc7854c89d3080a1973a28f5ca45ea15f92f7a58196abaaabb1ae9daeeab5b0b3b1e5b8e5bae8bfbcebb9be85a8e4f399f5efe09fe19b94ebece7ccb894908e989591c59bcac89ce0c8b9df9d9aa7e5fee1be85b1a9cce9e7daf2f1f3def3afffd3f625f6f927f8fbf976ea2dc230c7c433c1c43635c539c9567b65d01ad3c2111f1318cdc9c8c134c5d527231210242812172619172a2f2e5f735379712c2b2f36686c7e4c3b3a3b013e6d3e01320c29017508750a780f0c20230c7e7d0d41134546441a481b15230b165278646d0f717171427e4b49786556756ea15f727774717aa7747c767b01eb0e1406ac5942171b13f06c49b7484b49bd50bd0f8c7d548351548685558900a78e8ca290a35f90969798aaacaacdf5f4ab87b3eff1adacf2f0a3f8f2aeadb09382efbc84be81bff28a898bf689fccadddbb88c8bffc4c1c480b2c59ac89f9ccb999c93c1b7d1e3d5d6d4ead8ebbcf2dedf20f2f4f0eef8f5f125fb2843b9992835fe3c3edbd3d4d6df26dddfdfc5ed3ad2d1d33ed3d2d3d9d605d6db7199978c48221722447571560b24161525192b1d1e413e4a332f606667683a3c631c003d396d03727004087277067b1c4f560e1312721d0d1a011857080a085017301b611e4d1e614f6063615568571c1923391e6b765e093ff4368fa6a47aa87b77a8aef2bc6844407e484541b54be1924c50babf4e81bf525754515a853f190f5b4d8aafb0ba9ab3b5b7bfb58db7a5bda8aba99db09db2e0b7b4e3b1b690a4f9bcfeeff4ecd6a2d6fadaf6f7f88a8c888690d085d793c2c09498c2c79692ed9a9f9c99e2cf9ce49ee19fd2e882ae8fe9f0ebfcfdcbf9e9c6e9e2e637f40ffa28fffc2bf9fc2e2dfd31c3374075866d8ec5223e6b528791faced8d5d105db0a08812c200fde110f22272421713d242c2629271a3231331e33323152733c34236729232b7f177d13661e127f2b04767505790b7d7e7c1240130d36070b1d5f1e0216265c551e2678506468525766595737634669725f6c746e716ff950797ba67b7a7b417ead7e41af422804ec4aaf4aa95d55a35d58abaa58985faf86845a885b57888e8f90a2a4a228e9e9f4d0a98098eaf1d6ccebcb9fb2b7b4b1bae7b4e1ba93b7ea828183ee8382d8a386f58689f7888b89fd90fd92c2fcd19a938ec6d486d98dd5dcdcf2c5efb5d0d6d7d8eaece8e6f0ede9ddf15461b8ad6725ec2961bbb3afbce82ffcc4fec1ff32ca94c71ccbcacbd1ce3dced164fad3d105d805da08dfdc0bd9dc0c669848210f16193b013f370f0a0977252c3c04383531653b6a683c006a6f3e7319434b5144086d0458545c42501211137e131213194b493c1947181b194d604d397a6764536164565565596b5d5e5e19e52a6dbaa6b4bb69696e62566561a169b2b04448b2b746b9b74a4f4c4b24fe00010b5355821c1817d51e705ba15e8d5ea18fa0feadbfa895aa98afac9ba9f7b49dade1b3e5e6e4bae8bbb7e8ec84b5db869abe9a9491ec9deee19485e2f3a4c1ff929794919ac7949c969995bca3adb68be1f8e3afa799b5acfde8ebe9ddf0ddf220aaf809f1f42625f529fb2d7506c230c3ff30363738caccc8c6d2a68c64d11800d9c91213c31c13cbc7c4ca2e25dc24de21df122a292b162b2a29476f517b741d2a33772474367f423f3c6b393c6e6d3d2c0f5f76740a780b07787e246a1214100e181511451b4a481c62210a47535562717d707343717d6a43675a7271735e7372737976a5740fe6342e3caf5aad04f10b17f66b44b6b545b94bbdbee15eaa534f808687885a5c037ca05d598da39290a4a89297a69bfceff6aeb3b292b5a1bda1baf6ada1a2ea91babb81beedbe81ef808381f58a83cbb4dac9f9938cb8bcc192d6efc6c49ac89b97c8ce92dcc8e4e09ee8e5e1d5eb81f2ecf0dadfee21dff2f7f4f1fa259fb9affbed2acfd3da3cd0d4d0d0d62dcae337c8cbc93dd03dd200d7d403d3a24749804cd9170e58704566f5101617182a2c28266d21031d336260343862676d43673a3f3c39026f3c043e013f70614c5274110a1a031e6e18006f0007024932451a481f1c4b191c4e4d1d51612317183f1d697d58181eec21315a6e787571a57baaa8214c80af7eb1af42474441119d444c464947ba525153be5352513213dc544387554a4e94b794b680b7b383ad8e9695a599ab9d9e9cb2e0b3afe290a6a4eff9baac80fbf8a1d0b7da8488f2f786f9f78ad280a392ff8c948e918fc2c1b39bc69b9a9be19ecd9ee1cfe0e18a90b1d7f0d8e2fdc2fdfcc9c9fa30e4302a0efa28fbf7282e2f30c2c4c0fecab380799e7f3ad6d06e6d9b4415d2d7d4d1da07d4dc8bf3d70a22215e020922232926175668506165684979527c1363753774367c654e141130
value: 183b144645154b7d0202082d05376c0417031d6876681d5a6d695d73a2a07478f98d76a9a77a7f7c7942af7c447e4314f7134b51b6465b5e495bac5f43ac454b5daf58855a885f5c8b595c8e8d5d93d5d4dac1ef9ab1a7cccccaa598b4b0aeb8b5b1e5bbb7e49680eaefbef1ef8287dfab8af7848c868987fa929193fe91f9d6c094df9694d6818f89daf4d4f7c5f0e8f9e1e4d6d5e5d9ebdddedcf220f199616a726df8e6f8a292a8bc07c33230c4c83237c6643be0cfccc9d23fccd4ce8ae502dad9db06dbdadb21de0dde2364657a230f28183b013b3c0c3d350708396d196566643a683b37686e6f700206767f44504477117a2c5e453f550e417f121714111a1a18361619174a6261634e384863696655666957686b695d705f19e52e76b97179b7bc61b96cb8bebf57a14f55b0b6b7b84a4c4846504d49bd51f4c1180dc7854c89d3080a1973a28f5ca45ea15f92f7a58196abaaabb1ae9daeeab5b0b3b1e5b8e5bae8bfbcebb9be85a8e4f399f5efe09fe19b94ebece7ccb894908e989591c59bcac89ce0c8b9df9d9aa7e5fee1be85b1a9cce9e7daf2f1f3def3afffd3f625f6f927f8fbf976ea2dc230c7c433c1c43635c539c9567b65d01ad3c2111f1318cdc9c8c134c5d527231210242812172619172a2f2e5f735379712c2b2f36686c7e4c3b3a3b013e6d3e01320c29017508750a780f0c20230c7e7d0d41134546441a481b15230b165278646d0f717171427e4b49786556756ea15f727774717aa7747c767b01eb0e1406ac5942171b13f06c49b7484b49bd50bd0f8c7d548351548685558900a78e8ca290a35f90969798aaacaacdf5f4ab87b3eff1adacf2f0a3f8f2aeadb09382efbc84be81bff28a898bf689fccadddbb88c8bffc4c1c480b2c59ac89f9ccb999c93c1b7d1e3d5d6d4ead8ebbcf2dedf20f2f4f0eef8f5f125fb2843b9992835fe3c3edbd3d4d6df26dddfdfc5ed3ad2d1d33ed3d2d3d9d605d6db7199978c48221722447571560b24161525192b1d1e413e4a332f606667683a3c631c003d396d03727004087277067b1c4f560e1312721d0d1a011857080a085017301b611e4d1e614f6063615568571c1923391e6b765e093ff4368fa6a47aa87b77a8aef2bc6844407e484541b54be1924c50babf4e81bf525754515a853f190f5b4d8aafb0ba9ab3b5b7bfb58db7a5bda8aba99db09db2e0b7b4e3b1b690a4f9bcfeeff4ecd6a2d6fadaf6f7f88a8c888690d085d793c2c09498c2c79692ed9a9f9c99e2cf9ce49ee19fd2e882ae8fe9f0ebfcfdcbf9e9c6e9e2e637f40ffa28fffc2bf9fc2e2dfd31c3374075866d8ec5223e6b528791faced8d5d105db0a08812c200fde110f22272421713d242c2629271a3231331e33323152733c34236729232b7f177d13661e127f2b04767505790b7d7e7c1240130d36070b1d5f1e0216265c551e2678506468525766595737634669725f6c746e716ff950797ba67b7a7b417ead7e41af422804ec4aaf4aa95d55a35d58abaa58985faf86845a885b57888e8f90a2a4a228e9e9f4d0a98098eaf1d6ccebcb9fb2b7b4b1bae7b4e1ba93b7ea828183ee8382d8a386f58689f7888b89fd90fd92c2fcd19a938ec6d486d98dd5dcdcf2c5efb5d0d6d7d8eaece8e6f0ede9ddf15461b8ad6725ec2961bbb3afbce82ffcc4fec1ff32ca94c71ccbcacbd1ce3dced164fad3d105d805da08dfdc0bd9dc0c669848210f16193b013f370f0a0977252c3c04383531653b6a683c006a6f3e7319434b5144086d0458545c42501211137e131213194b493c1947181b194d604d397a6764536164565565596b5d5e5e19e52a6dbaa6b4bb69696e62566561a169b2b04448b2b746b9b74a4f4c4b24fe00010b5355821c1817d51e705ba15e8d5ea18fa0feadbfa895aa98afac9ba9f7b49dade1b3e5e6e4bae8bbb7e8ec84b5db869abe9a9491ec9deee19485e2f3a4c1ff929794919ac7949c969995bca3adb68be1f8e3afa799b5acfde8ebe9ddf0ddf220aaf809f1f42625f529fb2d7506c230c3ff30363738caccc8c6d2a68c64d11800d9c91213c31c13cbc7c4ca2e25dc24de21df122a292b162b2a29476f517b741d2a33772474367f423f3c6b393c6e6d3d2c0f5f76740a780b07787e246a1214100e181511451b4a481c62210a47535562717d707343717d6a43675a7271735e7372737976a5740fe6342e3caf5aad04f10b17f66b44b6b545b94bbdbee15eaa534f808687885a5c037ca05d598da39290a4a89297a69bfceff6aeb3b292b5a1bda1baf6ada1a2ea91babb81beedbe81ef808381f58a83cbb4dac9f9938cb8bcc192d6efc6c49ac89b97c8ce92dcc8e4e09ee8e5e1d5eb81f2ecf0dadfee21dff2f7f4f1fa259fb9affbed2acfd3da3cd0d4d0d0d62dcae337c8cbc93dd03dd200d7d403d3a24749804cd9170e58704566f5101617182a2c28266d21031d336260343862676d43673a3f3c39026f3c043e013f70614c5274110a1a031e6e18006f0007024932451a481f1c4b191c4e4d1d51612317183f1d697d58181eec21315a6e787571a57baaa8214c80af7eb1af42474441119d444c464947ba525153be5352513213dc544387554a4e94b794b680b7b383ad8e9695a599ab9d9e9cb2e0b3afe290a6a4eff9baac80fbf8a1d0b7da8488f2f786f9f78ad280a392ff8c948e918fc2c1b39bc69b9a9be19ecd9ee1cfe0e18a90b1d7f0d8e2fdc2fdfcc9c9fa30e4302a0efa28fbf7282e2f30c2c4c0fecab380799e7f3ad6d06e6d9b4415d2d7d4d1da07d4dc8bd5fd0a2221230e232223720c15262917282b291d301d3260355f2668367c65387822797e7b16671628627a5d780a0c0806100d097d134240166e030b430c45001f484b370a36641e611f526a696b0b67406b716e5d6e715f70285ba578a57aa87f7cab797caead7fda06ecb4ae4ab55a5eacaea894454d4657547f51855b8a885ca08a8f5e918fa0d1e5edffd2a6b6a6fdf5cff79bb39eb3b2b3b9b6e5ebb5cdb8bbb9ed80ed82f0dcaef38184f6f585f98bfdfefc92c2f8ca99c4ddc8978d8182f08a8dd5f0c4c6e8c2d2d7e6d9d7eaefece9f2dfecf698b0a377bffbe126afa8ae84d42dfec12fc0c3c1359539e038cfcc3bc9cc3e3d962bd3050604da08dbd7080e0f10204f65872a3f21183a030c3c270e0739770c3e1d34313a67343c3639376a02010118424e564c046f065d255d4e237d107d12401714434c3e464515496641644c6250631d20171011242d3c2f3f231a0932f6e57662a2dc0b83fa
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
Expand Down

0 comments on commit e1766bc

Please sign in to comment.