Commit 2310da0a authored by Andrew Conn's avatar Andrew Conn
Browse files

Merge branch 'EnemyMovementHopefullyNotBrokenThisTimeIDK' into 'master'

Enemy movement hopefully not broken this time idk

See merge request !1
parents 1f1abf99 e996ef41
fileFormatVersion: 2
guid: d1c1a2d988f5148fd9ab17b2460d271e
timeCreated: 1491258705
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 6597c6ea86d36477081342001145d8d9
timeCreated: 1492551631
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a342381d77833427fa10621e38fbae10
timeCreated: 1491945648
licenseType: Pro
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
data:
enabled: 0
settings: {}
userData:
assetBundleName:
assetBundleVariant:
**Unity Companion Package License v1.0 ("_License_")**
Copyright © 2017 Unity Technologies ApS ("**_Unity_**")
Unity hereby grants to you a worldwide, non-exclusive, no-charge, and royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute the software that is made available with this License ("**_Software_**"), subject to the following terms and conditions:
1. *Unity Companion Use Only*. Exercise of the license granted herein is limited to exercise for the creation, use, and/or distribution of applications, software, or other content pursuant to a valid Unity development engine software license ("**_Engine License_**"). That means while use of the Software is not limited to use in the software licensed under the Engine License, the Software may not be used for any purpose other than the creation, use, and/or distribution of Engine License-dependent applications, software, or other content. No other exercise of the license granted herein is permitted.
1. *No Modification of Engine License*. Neither this License nor any exercise of the license granted herein modifies the Engine License in any way.
1. *Ownership & Grant Back to You*.
3.1. You own your content. In this License, "derivative works" means derivatives of the Software itself--works derived only from the Software by you under this License (for example, modifying the code of the Software itself to improve its efficacy); “derivative works” of the Software do not include, for example, games, apps, or content that you create using the Software. You keep all right, title, and interest to your own content.
3.2. Unity owns its content. While you keep all right, title, and interest to your own content per the above, as between Unity and you, Unity will own all right, title, and interest to all intellectual property rights (including patent, trademark, and copyright) in the Software and derivative works of the Software, and you hereby assign and agree to assign all such rights in those derivative works to Unity.
3.3. You have a license to those derivative works. Subject to this License, Unity grants to you the same worldwide, non-exclusive, no-charge, and royalty-free copyright license to derivative works of the Software you create as is granted to you for the Software under this License.
1. *Trademarks*. You are not granted any right or license under this License to use any trademarks, service marks, trade names, products names, or branding of Unity or its affiliates ("**_Trademarks_**"). Descriptive uses of Trademarks are permitted; see, for example, Unity’s Branding Usage Guidelines at [https://unity3d.com/public-relations/brand](https://unity3d.com/public-relations/brand).
1. *Notices & Third-Party Rights*. This License, including the copyright notice above, must be provided in all substantial portions of the Software and derivative works thereof (or, if that is impracticable, in any other location where such notices are customarily placed). Further, if the Software is accompanied by a Unity "third-party notices" or similar file, you acknowledge and agree that software identified in that file is governed by those separate license terms.
1. *DISCLAIMER, LIMITATION OF LIABILITY*. THE SOFTWARE AND ANY DERIVATIVE WORKS THEREOF IS PROVIDED ON AN "AS IS" BASIS, AND IS PROVIDED WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND/OR NONINFRINGEMENT. IN NO EVENT SHALL ANY COPYRIGHT HOLDER OR AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES (WHETHER DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL, INCLUDING PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA, OR PROFITS, AND BUSINESS INTERRUPTION), OR OTHER LIABILITY WHATSOEVER, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM OR OUT OF, OR IN CONNECTION WITH, THE SOFTWARE OR ANY DERIVATIVE WORKS THEREOF OR THE USE OF OR OTHER DEALINGS IN SAME, EVEN WHERE ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1. *USE IS ACCEPTANCE and License Versions*. Your receipt and use of the Software constitutes your acceptance of this License and its terms and conditions. Software released by Unity under this License may be modified or updated and the License with it; upon any such modification or update, you will comply with the terms of the updated License for any use of any of the Software under the updated License.
1. *Use in Compliance with Law and Termination*. Your exercise of the license granted herein will at all times be in compliance with applicable law and will not infringe any proprietary rights (including intellectual property rights); this License will terminate immediately on any breach by you of this License.
1. *Severability*. If any provision of this License is held to be unenforceable or invalid, that provision will be enforced to the maximum extent possible and the other provisions will remain in full force and effect.
1. *Governing Law and Venue*. This License is governed by and construed in accordance with the laws of Denmark, except for its conflict of laws rules; the United Nations Convention on Contracts for the International Sale of Goods will not apply. If you reside (or your principal place of business is) within the United States, you and Unity agree to submit to the personal and exclusive jurisdiction of and venue in the state and federal courts located in San Francisco County, California concerning any dispute arising out of this License ("**_Dispute_**"). If you reside (or your principal place of business is) outside the United States, you and Unity agree to submit to the personal and exclusive jurisdiction of and venue in the courts located in Copenhagen, Denmark concerning any Dispute.
fileFormatVersion: 2
guid: 4c6fe94acbb24417c988bab18cbd5209
timeCreated: 1504642506
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
# Unity Ads
Implementation of the Unity Ads API.
fileFormatVersion: 2
guid: 62772aad98ed04f0d955b7d20de61f7f
timeCreated: 1493316656
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 5e57a6c62c1ec47d0bceb70495845164
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3b07d432cba2a4c4f8a2fdea984620b8
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
isPreloaded: 0
isOverridable: 0
platformData:
- first:
'': Any
second:
enabled: 0
settings:
Exclude Android: 0
Exclude Editor: 0
Exclude Linux: 1
Exclude Linux64: 1
Exclude LinuxUniversal: 1
Exclude OSXIntel: 1
Exclude OSXIntel64: 1
Exclude OSXUniversal: 1
Exclude Win: 1
Exclude Win64: 1
Exclude iOS: 0
- first:
Android: Android
second:
enabled: 1
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 1
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
- first:
Facebook: Win
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Facebook: Win64
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Standalone: Linux
second:
enabled: 0
settings:
CPU: x86
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: LinuxUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: OSXIntel
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Standalone: OSXIntel64
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
Windows Store Apps: WindowsStoreApps
second:
enabled: 0
settings:
CPU: AnyCPU
- first:
iPhone: iOS
second:
enabled: 1
settings:
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:
{
"category": "AssetStore/Unity",
"description": "Unity Ads is a video ad network for iOS and Android that allows you to quickly and effectively monetize your games.",
"gitHead": "0d2114387a99011be685886f8ea902242e323e70",
"keywords": [
"ads",
"unity"
],
"name": "com.unity.ads",
"repoPackagePath": "build/install/com.unity.ads",
"repository": {
"type": "git",
"url": "ssh://git@github.com/Unity-Technologies/com.unity.ads.git"
},
"unity": "2017.4",
"version": "2.0.8"
}
\ No newline at end of file
fileFormatVersion: 2
guid: dced8f6ea9f964e8e8e61574ea889d21
timeCreated: 1491258710
licenseType: Pro
TextScriptImporter:
userData:
assetBundleName:
assetBundleVariant:
## [3.2.2] - 2018-11-02
- Removed FetchOptOutStatus and Initialize call. All application of opt out
status will be handled by the engine. The Analytics/Data Privacy package still
provides FetchPrivacyUrl to provide a URL from which to opt out.
## [3.2.1] - 2018-10-25
- Move editor and playmode tests to be packed within the package.
## [3.2.0] - 2018-10-11
- Prevent double-registration of standard events.
- Fixed build error on platforms that don't support analytics.
- Update package docs so they can be built and published and be accessible from
the Package Manager UI.
- Fixed a crash occurring on iOS device when the device has cellular capability
but was never configured with any carrier service.
- Fixed an android build failure occurring due to conflicting install referrer
AIDL files.
## [3.1.1] - 2018-08-21
- Add DataPrivacy plugin into package.
- Fixed an issue where Android project build would fail when proguard is enabled
in publishing settings.
- Fixed an issue where iOS product archive would fail because bitcode was not
enabled.
## [3.0.9] - 2018-07-31
- Fixing issue with NullReferenceException during editor playmode
## [3.0.8] - 2018-07-26
- Fixing linking issue when building Android il2cpp
## [3.0.7] - 2018-07-10
- Adding in continuous events for signal strength, battery level, battery
temperature, memory usage, available storage
## [3.0.6] - 2018-06-01
- Reorganizing platformInfo event around session start/resume/pause
## [3.0.5] - 2018-05-29
- Fixing cellular signal strength incorrect array format
## [3.0.4] - 2018-05-04
- Breaking change to only work with 2018.2 (change name of whitelisted dll's in
engine to conform to PackageManager standard)
- Changed name of old Analytics dll to the Unity.Analytics.Tracker.dll and
replaced the old one with the new platform information package.
- Changed naming convention of dlls to the PackageManager Standard:
Unity.Analytics.dll, Unity.Analytics.Editor.dll, Unity.Analytics.Tracker.dll,
Unity.Analytics.StandardEvents.dll.
- Deprecated old Analytics tracker and removed it from the add component menu.
- Merged Standardevents package into Analytics package.
## [2.0.14] - 2018-02-08
- Added proper documentation and better description text.
## [2.0.5] -
- Update analytics tracker to 2.0 (1.0 version is still available)
fileFormatVersion: 2
guid: bcd27da1c9ae94d2cafe094482a20792
timeCreated: 1511216857
licenseType: Pro
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8aafd27f78c12564281bac0d0067df8d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Unity.Analytics.DataPrivacy.Tests")]
[assembly: InternalsVisibleTo("Unity.Analytics.DataPrivacy.WebRequest.Tests")]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment