Updated project to unity 5, finalized terrain generation

This commit is contained in:
2015-05-08 11:09:28 +03:00
parent 76527c2619
commit b1a8da324d
748 changed files with 20345 additions and 1571 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,5 +1,5 @@
<!--
This file defines some of the browsers that Microsoft's implementation provides in
<!--
This file defines some of the browsers that Microsoft's implementation provides in
<windir>\Microsoft.NET\Framework\<ver>\CONFIG\Browsers\*.browser
It is not derived from any file distributed with Microsoft's implementation. Since
@ -7,36 +7,36 @@
browser capabilities. Then, if and only if the application contains App_Browser/*.browser
files and we are using .NET 2.0 or higher, we supplement the capabilities with the
information in those files and the files in this directory. The primary goal of this file
is provide browser definitions that might be referenced in App_Browser/*.browser files.
-->
<browsers>
<defaultBrowser id="Default">
is provide browser definitions that might be referenced in App_Browser/*.browser files.
-->
<browsers>
<defaultBrowser id="Default">
</defaultBrowser>
<browser id="Default">
<identification>
<userAgent match="." />
</identification>
</browser>
</identification>
</browser>
<browser id="IE6to9" parentID="Default">
<identification>
<capability name="majorver" match="^[6-9]" />
<capability name="browser" match="^(IE|AOL)$" />
</identification>
</browser>
<browser id="Opera8to9" parentID="Default">
</identification>
</browser>
<browser id="Opera8to9" parentID="Default">
<identification>
<capability name="majorver" match="^[8-9]" />
<capability name="browser" match="^Opera$" />
</identification>
</browser>
<browser id="Safari" parentID="Default">
</identification>
</browser>
<browser id="Safari" parentID="Default">
<identification>
<capability name="browser" match="^Safari$" />
</identification>
</browser>
<browser id="Mozilla" parentID="Default">
</identification>
</browser>
<browser id="Mozilla" parentID="Default">
<identification>
<capability name="browser" match="^Mozilla" />
</identification>
</browser>
</identification>
</browser>
</browsers>

View File

@ -1 +1 @@
listen 3349146167 1 1
listen 267420748 1 1

Binary file not shown.

View File

@ -1,70 +1,40 @@
Initialize engine version: 4.6.1f1 (d1db7a1b5196)
Initialize engine version: 5.0.1f1 (5a2e8fe35a68)
GfxDevice: creating device client; threaded=1
Direct3D:
Version: Direct3D 11.0 [level 10.1]
Renderer: ATI Mobility Radeon HD 4500/5100 Series (ID=0x9553)
Vendor: ATI
VRAM: 505 MB
Version: Direct3D 11.0 [level 11.0]
Renderer: NVIDIA GeForce GTX 750 (ID=0x1381)
Vendor: NVIDIA
VRAM: 968 MB
Begin MonoManager ReloadAssembly
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.dll (this message is harmless)
Loading E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.dll into Unity Child Domain
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp-firstpass.dll (this message is harmless)
Loading E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp-firstpass.dll into Unity Child Domain
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp.dll (this message is harmless)
Loading E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp.dll into Unity Child Domain
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll (this message is harmless)
Loading E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll (this message is harmless)
Loading E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
- Completed reload, in 0.331 seconds
desktop: 1366x768 60Hz; virtual: 1366x768 at 0,0
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.dll into Unity Child Domain
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp-firstpass.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp-firstpass.dll into Unity Child Domain
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-CSharp.dll into Unity Child Domain
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\Assembly-UnityScript-firstpass.dll into Unity Child Domain
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll (this message is harmless)
Loading C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\UnityEngine.UI.dll into Unity Child Domain
- Completed reload, in 0.094 seconds
desktop: 1920x1080 60Hz; virtual: 1920x1080 at 0,0
<RI> Initializing input.
<RI> Input initialized.
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\System.Core.dll (this message is harmless)
Profiler is only supported with Pro License
(Filename: C:/BuildAgent/work/d63dfc6385190b60/Runtime/Profiler/ProfilerConnection.cpp Line: 218)
Generating map...
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
<GenerateMap>c__Iterator0:MoveNext() (at E:\Facultate\$ Licenta\Game\Assets\Scripts\Test.cs:24)
UnityEngine.MonoBehaviour:StartCoroutine_Auto(IEnumerator)
UnityEngine.MonoBehaviour:StartCoroutine(IEnumerator) (at C:\BuildAgent\work\d63dfc6385190b60\artifacts\StandalonePlayerGenerated\UnityEngineMonoBehaviour.cs:62)
Test:Start() (at E:\Facultate\$ Licenta\Game\Assets\Scripts\Test.cs:19)
(Filename: E Line: 0)
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\Boo.Lang.dll (this message is harmless)
Generating mesh...
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
<GenerateMap>c__Iterator0:MoveNext() (at E:\Facultate\$ Licenta\Game\Assets\Scripts\Test.cs:41)
(Filename: E Line: 0)
<RI> Input initialized.
<RI> Initialized touch support.
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\System.Core.dll (this message is harmless)
Platform assembly: E:\Facultate\$ Licenta\Game\TransportGame_Data\Managed\System.dll (this message is harmless)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\System.Xml.dll (this message is harmless)
Platform assembly: C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\TransportGame_Data\Managed\System.dll (this message is harmless)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.
UnityEngine.Terrain:CreateTerrainGameObject(TerrainData)
<GenerateMap>c__Iterator0:MoveNext() (at C:\Users\Tibi\Google Drive\FacultateCY\$ Licenta\Game\Assets\Scripts\Unity\TerrainGeneratorScript.cs:67)
[C:/buildslave/unity/build/Runtime/Terrain/SplatMaterials.cpp line 383]
(Filename: C:/Users/Tibi/Google Drive/FacultateCY/$ Licenta/Game/Assets/Scripts/Unity/TerrainGeneratorScript.cs Line: 67)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.
(Filename: C:/BuildAgent/work/d63dfc6385190b60/Runtime/Terrain/SplatMaterials.cpp Line: 105)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.
(Filename: C:/BuildAgent/work/d63dfc6385190b60/Runtime/Terrain/DetailRenderer.cpp Line: 60)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.
(Filename: C:/BuildAgent/work/d63dfc6385190b60/Runtime/Terrain/SplatMaterials.cpp Line: 105)
Finished generating map.
UnityEngine.Debug:Internal_Log(Int32, String, Object)
UnityEngine.Debug:Log(Object)
<GenerateMap>c__Iterator0:MoveNext() (at E:\Facultate\$ Licenta\Game\Assets\Scripts\Test.cs:76)
Unable to find shaders used for the terrain engine. Please include Nature/Terrain/Diffuse shader in Graphics settings.