199,957 Commits over 4,140 Days - 2.01cph!
Merge branch 'master' of arcade into Unity5
Conflicts:
Unity/Assets/Prefabs/LegacyCabinet.prefab
Unity/Assets/Scenes/GameTest.unity
Unity/Assets/Scenes/Test.unity
Unity/Assets/Scripts/ClickToPlayTest.cs
Unity/Assets/Scripts/Events/PlayerJoinRequest.asset
Unity/Assets/Scripts/GameManager.cs
Unity/Assets/Scripts/Networking/SharedCallbacks.cs
Unity/Assets/bolt/assemblies/bolt.dll
Unity/Assets/bolt/assemblies/bolt.dll.mdb
Unity/Assets/bolt/assemblies/editor/bolt.editor.dll
Unity/Assets/bolt/assemblies/editor/bolt.editor.dll.mdb
Unity/Assets/bolt/assemblies/udpkit/udpkit.dll
Unity/Assets/bolt/assemblies/udpkit/udpkit.dll.mdb
Unity/Assets/bolt/scenes/BoltDebugScene.unity
premake5.lua
Fixed premake5.lua to include Unity binary location resolution.
Fixed premake5.lua to include Unity binary location resolution.
Fixed premake5.lua looking for Unity binaries in the wrong location.
Fixed premake5.lua looking for Unity binaries in the wrong location.
Included Diogo's fixed BudgetBoySprite.shader that splits a matrix varying into component vectors.
Included Diogo's fixed BudgetBoySprite.shader that splits a matrix varying into component vectors.
Merge branch 'master' of arcade into Unity5
Merge branch 'master' of arcade into Unity5
Fixed a warning in UnityAudioProvider.cs
Fixed a warning in UnityAudioProvider.cs
Reverted to old Unity5 specific bolt binaries.
Reverted to old Unity5 specific bolt binaries.
Updated Unity scripts, commented out chatbox related stuff temporarily.
Updated Unity scripts, commented out chatbox related stuff temporarily.
Fixed the LegacyCabinet prefab.
Fixed the LegacyCabinet prefab.
Fixed typo that led to discontinuity in 2D simplex noise
Cleaned up code
Made noise code file names uppercase, to be consistent with Diogo's naming convention
Added better default settings for the Unit Settings and it's now hard-setting the species, race and gender enums with "ShowOnly", so that this can't be changed in the inspector. I also added a ColorUtility that gives access to basic operations such as color blending, lightening, darkening, desaturating, etc, which I use to automatically modify the hair color of different ages in the initial unit settings (for both human and bear).
The premake script will now store the Unity 5 install location in unitypath.txt, and will automatically detect if gmcs.exe needs copying.
The premake script will now store the Unity 5 install location in unitypath.txt, and will automatically detect if gmcs.exe needs copying.
Added default scaleModifier settings for Age to Unit Settings.
Started on Group Settings.
[ultimate_soldier] moved gunshot handling from Player to GameStage
[ultimate_soldier] moved gunshot handling from Player to GameStage
Static member binding definition files are now named X.Static.cs
Static member binding definition files are now named X.Static.cs
[ultimate_soldier] gun class
[ultimate_soldier] gun class
Merge branch 'master' of github.com:Facepunch/arcade
Merge branch 'master' of github.com:Facepunch/arcade
Started work on constructor bindings generation, partially complete.
Started work on constructor bindings generation, partially complete.
Fleshed out the Tribe Group Settings some more.
Merge branch 'master' of arcade
Merge branch 'master' of arcade
Added composite noise, tweaked simplex noise normalization
Removed flto flag from build definitions (were only added for testing purposes, shouldn't have been committed)
Updated Windows and Linux builds
Updated Bolt to latest version and compiled for 5.0. Updated to latest steamworks.net version.
Updated Bolt to latest version and compiled for 5.0. Updated to latest steamworks.net version.
Finished implementing constructor bindings generation.
Finished implementing constructor bindings generation.
Merge branch 'master' of arcade
Merge branch 'master' of arcade
Fixed the desert grass tone
