Skip to content

Commit 83273e6

Browse files
greenfire27greenfire27
committed
Merge pull request #309 from GarageGames/development
Torque2D 3.2!
2 parents 5f28504 + 3ab79d5 commit 83273e6

File tree

225 files changed

+75621
-13453
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+75621
-13453
lines changed

‎.gitignore

+9-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.LSOverride
66
/tmp/*
77
/preferences.cs
8+
/engine/**/preferences.cs
89
*.dso
910
*.edso
1011
*.user
@@ -26,7 +27,7 @@ Torque2D_DEBUG.exe
2627
Torque2DGame.app
2728
Torque2DGame_Debug.app
2829
linkmap.txt
29-
30+
3031
# Compiled source #
3132
###################
3233
*.com
@@ -68,4 +69,10 @@ engine/compilers/android/.settings/org.eclipse.cdt.core.prefs
6869
engine/compilers/android/bin/
6970
engine/compilers/android/gen/
7071
engine/compilers/android/obj/
71-
72+
engine/compilers/android-studio/.gradle/
73+
engine/compilers/android-studio/build/
74+
engine/compilers/android-studio/app/build/
75+
engine/compilers/android-studio/local.properties
76+
engine/compilers/android-studio/app/src/main/obj/
77+
engine/compilers/android-studio/app/src/main/libs/
78+
engine/compilers/android-studio/app/src/main/game/

‎LICENSE.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2012 GarageGames, LLC
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to
5+
deal in the Software without restriction, including without limitation the
6+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
sell copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
IN THE SOFTWARE.

‎README.md

+21
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,24 @@ Don't go it alone! Join the active community around Torque 2D at GarageGames.com
5151
* [Torque 2D Beginner Forum](http://www.garagegames.com/community/forums/84)
5252
* [Torque 2D Professional Forum](http://www.garagegames.com/community/forums/85)
5353
* [GarageGames Community Blogs](http://www.garagegames.com/community/blogs)
54+
55+
# License
56+
Copyright (c) 2012 GarageGames, LLC
57+
58+
Permission is hereby granted, free of charge, to any person obtaining a copy
59+
of this software and associated documentation files (the "Software"), to
60+
deal in the Software without restriction, including without limitation the
61+
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
62+
sell copies of the Software, and to permit persons to whom the Software is
63+
furnished to do so, subject to the following conditions:
64+
65+
The above copyright notice and this permission notice shall be included in
66+
all copies or substantial portions of the Software.
67+
68+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
69+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
70+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
71+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
72+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
73+
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
74+
IN THE SOFTWARE.

‎engine/compilers/Make/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ APP_TARGETS_DEBUG :=
99
all: debug release
1010

1111
clean:
12-
rm -rfv Debug
13-
rm -rfv Release
14-
rm -rfv lib
12+
rm -rf Debug
13+
rm -rf Release
14+
rm -rf lib
1515

1616
.PHONY: all debug release clean
1717

‎engine/compilers/Project1/Project1.vcxproj

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{0E947C0D-AB66-4F43-B453-91B7DF61A133}</ProjectGuid>
15+
<RootNamespace>Project1</RootNamespace>
16+
</PropertyGroup>
17+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
18+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
19+
<ConfigurationType>Application</ConfigurationType>
20+
<UseDebugLibraries>true</UseDebugLibraries>
21+
<PlatformToolset>v120</PlatformToolset>
22+
<CharacterSet>MultiByte</CharacterSet>
23+
</PropertyGroup>
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25+
<ConfigurationType>Application</ConfigurationType>
26+
<UseDebugLibraries>false</UseDebugLibraries>
27+
<PlatformToolset>v120</PlatformToolset>
28+
<WholeProgramOptimization>true</WholeProgramOptimization>
29+
<CharacterSet>MultiByte</CharacterSet>
30+
</PropertyGroup>
31+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32+
<ImportGroup Label="ExtensionSettings">
33+
</ImportGroup>
34+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
35+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
36+
</ImportGroup>
37+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39+
</ImportGroup>
40+
<PropertyGroup Label="UserMacros" />
41+
<PropertyGroup />
42+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
43+
<ClCompile>
44+
<WarningLevel>Level3</WarningLevel>
45+
<Optimization>Disabled</Optimization>
46+
<SDLCheck>true</SDLCheck>
47+
</ClCompile>
48+
<Link>
49+
<GenerateDebugInformation>true</GenerateDebugInformation>
50+
</Link>
51+
</ItemDefinitionGroup>
52+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
53+
<ClCompile>
54+
<WarningLevel>Level3</WarningLevel>
55+
<Optimization>MaxSpeed</Optimization>
56+
<FunctionLevelLinking>true</FunctionLevelLinking>
57+
<IntrinsicFunctions>true</IntrinsicFunctions>
58+
<SDLCheck>true</SDLCheck>
59+
</ClCompile>
60+
<Link>
61+
<GenerateDebugInformation>true</GenerateDebugInformation>
62+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
63+
<OptimizeReferences>true</OptimizeReferences>
64+
</Link>
65+
</ItemDefinitionGroup>
66+
<ItemGroup>
67+
</ItemGroup>
68+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
69+
<ImportGroup Label="ExtensionTargets">
70+
</ImportGroup>
71+
</Project>

‎engine/compilers/Project1/Project1.vcxproj.filters

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
</Project>

0 commit comments

Comments
 (0)