Skip to content

Duplicar escenario #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsansdom wants to merge 2 commits into
base: pfiguero-Escenario
Choose a base branch
from
Open

Duplicar escenario #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c43b0b0
Duplicar escenario
jsansdom Oct 6, 2016
25598b3
Añadido Assets/Environment
jsansdom Oct 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .../3rdParty/Realistic Terrain Collection/Other/Effects/ImageEffects/Scripts/DepthOfField.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ void ReleaseComputeResources () {
void CreateComputeResources () {
if (cbDrawArgs == null)
{
cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.DrawIndirect);
cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.IndirectArguments);
var args= new int[4];
args[0] = 0; args[1] = 1; args[2] = 0; args[3] = 0;
cbDrawArgs.SetData (args);
Expand Down
Binary file modified Assets/3rdParty/Realistic Terrain Collection/Terrains/Terrain1/Medium Resolution_1.asset
View file
Open in desktop
Binary file not shown.
23 changes: 8 additions & 15 deletions Assets/Editor/CrossPlatformInput/CrossPlatformInputInitialize.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ private static void Enable()
{
case BuildTarget.Android:
case BuildTarget.iOS:
case BuildTarget.WP8Player:
case BuildTarget.BlackBerry:
case BuildTarget.PSM:
case BuildTarget.Tizen:
case BuildTarget.WSAPlayer:
case BuildTarget.PSM:
case BuildTarget.Tizen:
case BuildTarget.WSAPlayer:
EditorUtility.DisplayDialog("Mobile Input",
"You have enabled Mobile Input. You'll need to use the Unity Remote app on a connected device to control your game in the Editor.",
"OK");
Expand Down Expand Up @@ -67,8 +65,6 @@ private static void Disable()
{
case BuildTarget.Android:
case BuildTarget.iOS:
case BuildTarget.WP8Player:
case BuildTarget.BlackBerry:
EditorUtility.DisplayDialog("Mobile Input",
"You have disabled Mobile Input. Mobile control rigs won't be visible, and the Cross Platform Input functions will always return standalone controls.",
"OK");
Expand All @@ -88,22 +84,19 @@ private static bool DisableValidate()
private static BuildTargetGroup[] buildTargetGroups = new BuildTargetGroup[]
{
BuildTargetGroup.Standalone,
BuildTargetGroup.WebPlayer,
BuildTargetGroup.Android,
BuildTargetGroup.iOS,
BuildTargetGroup.WP8,
BuildTargetGroup.BlackBerry
BuildTargetGroup.WSA
};

private static BuildTargetGroup[] mobileBuildTargetGroups = new BuildTargetGroup[]
{
BuildTargetGroup.Android,
BuildTargetGroup.iOS,
BuildTargetGroup.WP8,
BuildTargetGroup.BlackBerry,
BuildTargetGroup.PSM,
BuildTargetGroup.Tizen,
BuildTargetGroup.WSA
BuildTargetGroup.PSM,
BuildTargetGroup.SamsungTV,
BuildTargetGroup.Tizen,
BuildTargetGroup.WSA
};


Expand Down
Loading