Permalink
Browse files

Merge pull request #415 from GarageGames/development

Torque 2D Version 3.4
  • Loading branch information...
greenfire27 committed May 8, 2018
2 parents 55efccc + b863ff1 commit cbe96941556edada849f145f26ba46009c61bdb6
Showing with 7,239 additions and 25,516 deletions.
  1. +2 −2 .gitignore
  2. BIN Leap.dll
  3. BIN Leapd.dll
  4. +10 −8 README.md
  5. +12 −10 engine/compilers/Make/Torque2D
  6. +7 −7 engine/compilers/Make/ljpeg
  7. +0 −3,219 engine/compilers/VisualStudio 2013/Torque 2D.vcxproj.filters
  8. +0 −186 engine/compilers/VisualStudio 2013/lpng.vcxproj
  9. +0 −184 engine/compilers/VisualStudio 2013/zlib.vcxproj
  10. BIN engine/compilers/VisualStudio 2015/Torque 2D.ico
  11. +0 −110 engine/compilers/VisualStudio 2015/Torque 2D.rc
  12. +0 −98 engine/compilers/VisualStudio 2015/Torque 2D.sln
  13. +0 −1,310 engine/compilers/VisualStudio 2015/Torque 2D.vcxproj
  14. +0 −181 engine/compilers/VisualStudio 2015/libogg.vcxproj
  15. +0 −243 engine/compilers/VisualStudio 2015/libvorbis.vcxproj
  16. +0 −630 engine/compilers/VisualStudio 2015/ljpeg.vcxproj
  17. +0 −65 engine/compilers/VisualStudio 2015/ljpeg.vcxproj.filters
  18. +0 −29 engine/compilers/VisualStudio 2015/lpng.vcxproj.filters
  19. +0 −33 engine/compilers/VisualStudio 2015/zlib.vcxproj.filters
  20. BIN engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Browse.VC.db
  21. BIN engine/compilers/VisualStudio 2017/.vs/Torque 2D/v15/Solution.VC.db
  22. BIN engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/Torque 2D.ico
  23. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/Torque 2D.rc
  24. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/Torque 2D.sln
  25. +23 −19 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/Torque 2D.vcxproj
  26. +12 −30 engine/compilers/{VisualStudio 2015 → VisualStudio 2017}/Torque 2D.vcxproj.filters
  27. +6 −5 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/libogg.vcxproj
  28. +6 −5 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/libvorbis.vcxproj
  29. +5 −4 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/ljpeg.vcxproj
  30. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/ljpeg.vcxproj.filters
  31. +5 −4 engine/compilers/{VisualStudio 2015 → VisualStudio 2017}/lpng.vcxproj
  32. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/lpng.vcxproj.filters
  33. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/main.cs
  34. +5 −4 engine/compilers/{VisualStudio 2015 → VisualStudio 2017}/zlib.vcxproj
  35. 0 engine/compilers/{VisualStudio 2013 → VisualStudio 2017}/zlib.vcxproj.filters
  36. +365 −107 engine/compilers/Xcode/Torque2D.xcodeproj/project.pbxproj
  37. +32 −18 engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj
  38. +3 −3 engine/compilers/android-studio/android-studio.iml
  39. +223 −17 engine/compilers/android-studio/app/app.iml
  40. +22 −41 engine/compilers/android-studio/app/build.gradle
  41. +0 −4 engine/compilers/android-studio/app/src/main/AndroidManifest.xml
  42. +29 −0 engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/FileWalker.java
  43. +14 −0 engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java
  44. +9 −10 engine/compilers/android-studio/app/src/main/jni/Android.mk
  45. +3 −3 engine/compilers/android-studio/app/src/main/jni/Application.mk
  46. +4 −1 engine/compilers/android-studio/build.gradle
  47. +2 −2 engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties
  48. +0 −42 engine/compilers/android-studio/import-summary.txt
  49. +0 −9 engine/compilers/android/.classpath
  50. +0 −56 engine/compilers/android/.cproject
  51. +0 −10 engine/compilers/android/.externalToolBuilders/NDK Builder.launch
  52. +0 −105 engine/compilers/android/.project
  53. +0 −66 engine/compilers/android/.settings/org.eclipse.cdt.codan.core.prefs
  54. +0 −11 engine/compilers/android/.settings/org.eclipse.jdt.core.prefs
  55. +0 −38 engine/compilers/android/AndroidManifest.xml
  56. BIN engine/compilers/android/assets/splash.png
  57. +0 −92 engine/compilers/android/build.xml
  58. BIN engine/compilers/android/ic_launcher-web.png
  59. +0 −589 engine/compilers/android/jni/Android.mk
  60. +0 −4 engine/compilers/android/jni/Application.mk
  61. +0 −3 engine/compilers/android/lint.xml
  62. +0 −15 engine/compilers/android/project.properties
  63. BIN engine/compilers/android/res/drawable-hdpi/ic_launcher.png
  64. BIN engine/compilers/android/res/drawable-ldpi/ic_launcher.png
  65. BIN engine/compilers/android/res/drawable-mdpi/ic_launcher.png
  66. BIN engine/compilers/android/res/drawable-xhdpi/ic_launcher.png
  67. +0 −3 engine/compilers/android/res/menu/activity_main.xml
  68. +0 −11 engine/compilers/android/res/values-v11/styles.xml
  69. +0 −12 engine/compilers/android/res/values-v14/styles.xml
  70. +0 −5 engine/compilers/android/res/values/strings.xml
  71. +0 −20 engine/compilers/android/res/values/styles.xml
  72. +0 −339 engine/compilers/android/src/com/garagegames/torque2d/FileWalker.java
  73. +0 −287 engine/compilers/android/src/com/garagegames/torque2d/FontManager.java
  74. +0 −9 engine/compilers/android/src/com/garagegames/torque2d/MyNativeActivity.java
  75. +0 −69 engine/compilers/android/src/com/garagegames/torque2d/SplashScreen.java
  76. +0 −75 engine/compilers/android/src/com/garagegames/torque2d/StreamingAudioPlayer.java
  77. +0 −139 engine/compilers/android/src/com/garagegames/torque2d/T2DUtilities.java
  78. +6 −1 engine/compilers/emscripten/CMakeLists.txt
  79. BIN engine/lib/freetype/android/lib/{ → armeabi-v7a}/libfreetype.a
  80. BIN engine/lib/freetype/android/lib/x86/libfreetype.a
  81. BIN engine/lib/freetype/android/lib/x86_64/libfreetype.a
  82. +0 −218 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALc.o.d
  83. +0 −215 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/ALu.o.d
  84. +0 −191 ...ib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcConfig.o.d
  85. +0 −206 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcEcho.o.d
  86. +0 −206 ...openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcModulator.o.d
  87. +0 −206 ...ib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcReverb.o.d
  88. +0 −188 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcRing.o.d
  89. +0 −191 ...ib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/alcThread.o.d
  90. +0 −179 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/android.o.d
  91. +0 −194 ...b/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/audiotrack.o.d
  92. +0 −83 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/bs2b.o.d
  93. +0 −215 ...ne/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/mixer.o.d
  94. +0 −188 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/null.o.d
  95. +0 −224 ...lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/opensles.o.d
  96. +0 −194 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/Alc/panning.o.d
  97. +0 −206 ...ndroid/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d
  98. +0 −200 ...penal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alBuffer.o.d
  99. +0 −197 ...l/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alDatabuffer.o.d
  100. +0 −197 ...penal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alEffect.o.d
  101. +0 −179 ...openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alError.o.d
  102. +0 −218 ...al/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alExtension.o.d
  103. +0 −197 ...penal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alFilter.o.d
  104. +0 −188 ...nal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alListener.o.d
  105. +0 −209 ...penal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alSource.o.d
  106. +0 −203 ...openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alState.o.d
  107. +0 −191 ...openal/Android/openal-soft-master/obj/local/armeabi/objs-debug/openal/OpenAL/OpenAL32/alThunk.o.d
  108. +0 −218 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALc.o.d
  109. +0 −215 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/ALu.o.d
  110. +0 −191 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcConfig.o.d
  111. +0 −206 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcEcho.o.d
  112. +0 −206 ...e/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcModulator.o.d
  113. +0 −206 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcReverb.o.d
  114. +0 −188 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcRing.o.d
  115. +0 −191 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/alcThread.o.d
  116. +0 −179 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/android.o.d
  117. +0 −194 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/audiotrack.o.d
  118. +0 −83 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/bs2b.o.d
  119. +0 −215 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/mixer.o.d
  120. +0 −188 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/null.o.d
  121. +0 −224 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/opensles.o.d
  122. +0 −194 engine/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/Alc/panning.o.d
  123. +0 −206 ...enal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alAuxEffectSlot.o.d
  124. +0 −200 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alBuffer.o.d
  125. +0 −197 .../openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alDatabuffer.o.d
  126. +0 −197 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alEffect.o.d
  127. +0 −179 ...e/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alError.o.d
  128. +0 −218 ...b/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alExtension.o.d
  129. +0 −197 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alFilter.o.d
  130. +0 −188 ...ib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alListener.o.d
  131. +0 −209 .../lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alSource.o.d
  132. +0 −203 ...e/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alState.o.d
  133. +0 −191 ...e/lib/openal/Android/openal-soft-master/obj/local/armeabi/objs/openal/OpenAL/OpenAL32/alThunk.o.d
  134. BIN engine/lib/openal/Android/x86_64/libopenal.so
  135. +1 −1 engine/source/2d/assets/ImageAsset.cc
  136. +1 −0 engine/source/2d/assets/ImageAsset.h
  137. +17 −0 engine/source/2d/assets/ImageAsset_ScriptBinding.h
  138. +14 −2 engine/source/2d/core/SpriteBatch.cc
  139. +2 −0 engine/source/2d/core/SpriteBatch.h
  140. +2 −2 engine/source/2d/core/SpriteBatchItem.cc
  141. +4 −4 engine/source/2d/core/Vector2_ScriptBinding.h
  142. +37 −13 engine/source/2d/scene/Scene.cc
  143. +2 −0 engine/source/2d/sceneobject/CompositeSprite.cc
  144. +2 −0 engine/source/2d/sceneobject/CompositeSprite.h
  145. +1 −0 engine/source/2d/sceneobject/CompositeSprite_ScriptBinding.h
  146. +14 −14 engine/source/2d/sceneobject/SceneObject.cc
  147. +5 −5 engine/source/2d/sceneobject/SceneObjectList.cc
  148. +3 −3 engine/source/2d/sceneobject/SceneObject_ScriptBinding.h
  149. +2 −2 engine/source/2d/sceneobject/SkeletonObject.cc
  150. +1 −1 engine/source/2d/sceneobject/TextSprite.cc
  151. +2 −2 engine/source/Box2D/Collision/Shapes/b2ChainShape.h
  152. +3 −3 engine/source/collection/simpleHashTable.h
  153. +1 −1 engine/source/console/consoleDoc.cc
  154. +1 −1 engine/source/console/output_ScriptBinding.h
  155. +3 −3 engine/source/debug/remote/RemoteDebuggerBase.cc
  156. +10 −7 engine/source/debug/remote/RemoteDebuggerBridge.cc
  157. +24 −22 engine/source/debug/telnetDebugger.cc
  158. +3 −3 engine/source/delegates/delegateSignal.h
  159. +2 −2 engine/source/game/version.h
  160. +2 −2 engine/source/graphics/dgl_ScriptBinding.h
  161. +1 −1 engine/source/gui/containers/guiGridCtrl.cc
  162. +13 −13 engine/source/gui/editor/guiGraphCtrl.cc
  163. +5 −1 engine/source/gui/guiCanvas.cc
  164. +6 −6 engine/source/gui/guiColorPicker.cc
  165. +1 −1 engine/source/gui/guiMessageVectorCtrl.cc
  166. +1 −1 engine/source/gui/guiTextEditCtrl.cc
  167. +36 −132 engine/source/input/actionMap.cc
  168. +0 −1 engine/source/input/actionMap.h
  169. +0 −176 engine/source/input/leapMotion/LeapMotionManager_ScriptBinding.h
  170. +0 −674 engine/source/input/leapMotion/leapMotionManager.cc
  171. +0 −162 engine/source/input/leapMotion/leapMotionManager.h
  172. +0 −109 engine/source/input/leapMotion/leapMotionUtil.cpp
  173. +159 −0 engine/source/io/byteBuffer.cpp
  174. +53 −16 engine/source/{input/leapMotion/leapMotionUtil.h → io/byteBuffer.h}
  175. +1 −1 engine/source/io/fileObject.cc
  176. +1 −1 engine/source/io/fileSystem_ScriptBinding.cc
  177. +31 −0 engine/source/io/nStream.cc
  178. +157 −0 engine/source/io/rawData.h
  179. +14 −0 engine/source/io/stream.h
  180. +66 −0 engine/source/math/mNormalDistribution.h
  181. +57 −0 engine/source/math/random_ScriptBinding.h
  182. +12 −0 engine/source/network/RemoteCommandEvent_ScriptBinding.h
  183. +15 −10 engine/source/network/netConnection.cc
  184. +2 −0 engine/source/network/netConnection.h
  185. +25 −12 engine/source/network/netConnection_ScriptBinding.h
  186. +14 −6 engine/source/network/netInterface.cc
  187. +5 −3 engine/source/network/netInterface.h
  188. +152 −17 engine/source/network/serverQuery.cc
  189. +45 −11 engine/source/network/tcpObject.cc
  190. +2 −0 engine/source/network/tcpObject.h
  191. +33 −41 engine/source/network/telnetConsole.cc
  192. +1 −1 engine/source/persistence/SimXMLDocument.cpp
  193. +6 −0 engine/source/persistence/taml/taml.cc
  194. +6 −37 engine/source/platform/event.h
  195. +15 −2 engine/source/platform/platform.h
  196. +2,036 −0 engine/source/platform/platformNet.cpp
  197. +263 −0 engine/source/platform/platformNet.h
  198. +223 −217 engine/source/platform/{platformNetAsync.unix.cc → platformNetAsync.cpp}
  199. +74 −73 engine/source/platform/{platformNetAsync.unix.h → platformNetAsync.h}
  200. +217 −0 engine/source/platform/platformNet_Emscripten.cpp
  201. +70 −58 engine/source/platform/{platformNetwork_ScriptBinding.cc → platformNet_ScriptBinding.cc}
  202. +0 −91 engine/source/platform/platformNetwork.h
  203. +2 −2 engine/source/platform/platformString.h
  204. +1 −13 engine/source/{input/leapMotion/leapMotionConstants.h → platform/tmm_off.h}
  205. +4 −4 engine/{compilers/VisualStudio 2015/main.cs → source/platform/tmm_on.h}
  206. +1 −0 engine/source/platform/types.ppc.h
  207. +425 −0 engine/source/platform/typetraits.h
  208. +45 −8 engine/source/platformAndroid/AndroidFileio.cpp
  209. +1 −1 engine/source/platformAndroid/AndroidInput.cpp
  210. +0 −885 engine/source/platformAndroid/AndroidNet.cpp
  211. +2 −2 engine/source/platformAndroid/AndroidStrings.cpp
  212. +3 −3 engine/source/platformAndroid/AndroidThread.cpp
  213. +94 −0 engine/source/platformAndroid/T2DActivity.cpp
  214. +7 −0 engine/source/platformAndroid/T2DActivity.h
  215. +2 −0 engine/{compilers/android/NDKKeyboardBugFix → source/platformAndroid}/android_native_app_glue.c
  216. +349 −0 engine/source/platformAndroid/android_native_app_glue.h
  217. +0 −198 engine/source/platformEmscripten/EmscriptenNet.cpp
  218. +2 −2 engine/source/platformEmscripten/EmscriptenStrings.cpp
  219. +1 −1 engine/source/platformOSX/osxCocoaUtilities.mm
  220. +0 −895 engine/source/platformOSX/osxNetwork.mm
  221. +2 −2 engine/source/platformOSX/osxString.mm
  222. +0 −867 engine/source/platformWin32/winNet.cc
  223. +2 −2 engine/source/platformWin32/winStrings.cc
  224. +2 −2 engine/source/platformWin32/winWindow.cc
  225. +0 −942 engine/source/platformX86UNIX/x86UNIXNet.cc
  226. +2 −2 engine/source/platformX86UNIX/x86UNIXStrings.cc
  227. +3 −2 engine/source/platformiOS/T2DView.mm
  228. +1 −1 engine/source/platformiOS/T2DViewController.mm
  229. +2 −2 engine/source/platformiOS/iOSFileio.mm
  230. +0 −884 engine/source/platformiOS/iOSNet.mm
  231. +2 −2 engine/source/platformiOS/iOSProcessControl.mm
  232. +2 −2 engine/source/platformiOS/iOSStrings.mm
  233. +2 −1 engine/source/platformiOS/iOSUtil.mm
  234. +31 −46 engine/source/platformiOS/iOSWindow.mm
  235. +5 −5 engine/source/sim/SimObjectList.cc
  236. +97 −0 engine/source/sim/simObject.cc
  237. +21 −0 engine/source/sim/simObject.h
  238. +117 −0 engine/source/sim/simObject_ScriptBinding.h
  239. +1 −2 engine/source/testing/googleTest/configure
  240. +1 −1 engine/source/testing/googleTest/configure.ac
  241. +2 −2 modules/AppCore/1/scripts/canvas.cs
  242. +70 −0 modules/KeyboardToy/1/ChangeUsernameDlg.gui.taml
  243. +70 −0 modules/KeyboardToy/1/MainGameDlg.gui.taml
  244. +50 −0 modules/KeyboardToy/1/main.cs
  245. +10 −0 modules/KeyboardToy/1/module.taml
  246. +5 −0 modules/VirtualKeyboard/1/assets/audios/keypress.taml
  247. BIN modules/VirtualKeyboard/1/assets/audios/keypress.wav
  248. BIN modules/VirtualKeyboard/1/assets/images/closeBtn.png
  249. +3 −0 modules/VirtualKeyboard/1/assets/images/closeBtn.taml
  250. BIN modules/VirtualKeyboard/1/assets/images/kbbD.png
  251. +3 −0 modules/VirtualKeyboard/1/assets/images/kbbD.taml
  252. BIN modules/VirtualKeyboard/1/assets/images/kbbN.png
  253. +3 −0 modules/VirtualKeyboard/1/assets/images/kbbN.taml
  254. BIN modules/VirtualKeyboard/1/assets/images/keyboardAlpha.png
  255. +3 −0 modules/VirtualKeyboard/1/assets/images/keyboardAlpha.taml
  256. BIN modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.png
  257. +3 −0 modules/VirtualKeyboard/1/assets/images/keyboardAlphaLower.taml
  258. BIN modules/VirtualKeyboard/1/assets/images/keyboardNumber.png
  259. +3 −0 modules/VirtualKeyboard/1/assets/images/keyboardNumber.taml
  260. BIN modules/VirtualKeyboard/1/assets/images/keyboardSymbol.png
  261. +3 −0 modules/VirtualKeyboard/1/assets/images/keyboardSymbol.taml
  262. BIN modules/VirtualKeyboard/1/assets/images/shiftSymbol1.png
  263. +3 −0 modules/VirtualKeyboard/1/assets/images/shiftSymbol1.taml
  264. BIN modules/VirtualKeyboard/1/assets/images/shiftSymbol2.png
  265. +3 −0 modules/VirtualKeyboard/1/assets/images/shiftSymbol2.taml
  266. BIN modules/VirtualKeyboard/1/assets/images/spaceBar.png
  267. +3 −0 modules/VirtualKeyboard/1/assets/images/spaceBar.taml
  268. BIN modules/VirtualKeyboard/1/assets/images/spaceBarD.png
  269. +3 −0 modules/VirtualKeyboard/1/assets/images/spaceBarD.taml
  270. +749 −0 modules/VirtualKeyboard/1/gui/keyboardGui.taml
  271. +225 −0 modules/VirtualKeyboard/1/main.cs
  272. +11 −0 modules/VirtualKeyboard/1/module.taml
@@ -59,8 +59,7 @@ linkmap.txt
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
Thumbs.db
*.db

# Android project files #
#########################
@@ -76,3 +75,4 @@ engine/compilers/android-studio/local.properties
engine/compilers/android-studio/app/src/main/obj/
engine/compilers/android-studio/app/src/main/libs/
engine/compilers/android-studio/app/src/main/game/
engine/compilers/android-studio/app/.externalNativeBuild/
BIN -1.17 MB Leap.dll
Binary file not shown.
BIN -1.89 MB Leapd.dll
Binary file not shown.
@@ -1,15 +1,15 @@
![Torque Logo](http://static.garagegames.com/static/pg/logokits/Torque-Logo_H.png)
## Torque 2D 3.3
## Torque 2D 3.4

MIT Licensed Open Source version of Torque 2D from GarageGames. Maintained by the T2D Steering Committee and contributions from the community.

Dedicated to 2D game development, Torque 2D is an extremely powerful, flexible, and fast C++ engine which has been used in hundreds of professional games. It is a true cross platform solution providing you access to Windows, OSX, Linux, iOS, Android, and the web - all from one codebase. It includes an OpenGL batched rendering system, Box2D physics, OpenAL audio, skeletal and spritesheet animation, automated asset management, a modular project structure, TAML object persistence, and a C-like scripting language.

### Branches

Here is an overview of the branches found in the Torque 2D repository:
Here is an overview of the branches found in the Torque 2D repository:

* **master:** this branch contains the current stable release code that can be used in a production environment.
* **master:** this branch contains the current stable release code that can be used in a production environment.
* **development:** this branch is dedicated to active development. It contains the latest bug fixes, new features, and other updates. All pull requests need to go to the development branch. While we try our best to test all incoming changes, it is possible for mistakes to slip in therefore this branch should always be considered unstable.
* **gh-pages:** this branch currently contains the html pages generated from doxygen for the engine and TorqueScript references.

@@ -21,19 +21,17 @@ If you do not wish to compile the source code yourself, precompiled binary files

After downloading a copy of the source code, the following project files for each platform are provided for you and can be found in the `engine/compilers` folder.

* **Windows:** Visual Studio 2013 or 2015 (works with the free, "Express for Windows Desktop" version)
* **Windows:** Visual Studio 2017 (works with the free Community Edition)
* **OSX:** Xcode
* **Linux:** Make
* **iOS:** Xcode_iOS
* **Android:** Eclipse or Android Studio
* **Android:** Android Studio
* **Web:** Emscripten/Cmake

See the [wiki](https://github.com/GarageGames/Torque2D/wiki) for available guides on platform setup and development.

### Batteries Included

![truck](http://t2dtutorials.com/img/Truck.png)

Running Torque 2D for the first time out of the box will start you off in the Sandbox. The Sandbox is a collection of over 30 simple "toys" (or modules) which demonstrate various features in T2D. The default toy is a side scrolling level with a monster truck. To see a list of the available modules/toys to choose from, click on the `Show Tools` button in the lower right corner of the screen.

Naturally all of the script code and assets for each toy are available to you in the modules folder to use as practical examples while learning T2D.
@@ -46,7 +44,11 @@ All documentation for the open source version of Torque 2D can be found on our [

### Community

Don't go it alone! Join the active community around Torque 2D at GarageGames.com. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork.
Don't go it alone! Join the active Torque community. Ask questions, talk about T2D and general game development topics, learn the latest news, or post a blog promoting your game or showing off additional engine features in your T2D fork.

* [Torque 2D Forums on the Torque 3D Website](https://forums.torque3d.org/viewforum.php?f=31)

You also might be able to find useful information on the less active GarageGames website.

* [Torque 2D Beginner Forum](http://www.garagegames.com/community/forums/84)
* [Torque 2D Professional Forum](http://www.garagegames.com/community/forums/85)
@@ -56,7 +56,15 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/assets/assetTagsManifest.cc \
../../source/assets/declaredAssets.cc \
../../source/assets/referencedAssets.cc \
../../source/audio/audio.cc \
../../source/audio/audioDataBlock.cc \
../../source/audio/audioDescriptions.cc \
../../source/audio/audio_ScriptBinding.cc \
../../source/audio/audioStreamSourceFactory.cc \
../../source/audio/wavStreamSource.cc \
../../source/audio/AudioAsset.cc \
../../source/audio/audioBuffer.cc \
../../source/audio/vorbisStreamSource.cc \
../../source/bitmapFont/BitmapFont.cc \
../../source/bitmapFont/BitmapFontCharacter.cc \
../../source/Box2D/Collision/b2BroadPhase.cpp \
@@ -175,6 +183,7 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/gui/language/lang.cc \
../../source/gui/messageVector.cc \
../../source/input/actionMap.cc \
../../source/io/byteBuffer.cpp \
../../source/io/bitStream.cc \
../../source/io/bufferStream.cc \
../../source/io/fileObject.cc \
@@ -241,13 +250,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/persistence/tinyXML/tinyxml.cpp \
../../source/persistence/tinyXML/tinyxmlerror.cpp \
../../source/persistence/tinyXML/tinyxmlparser.cpp \
../../source/audio/vorbisStreamSource.cc \
../../source/audio/audio.cc \
../../source/audio/audioBuffer.cc \
../../source/audio/audioDataBlock.cc \
../../source/audio/audio_ScriptBinding.cc \
../../source/audio/audioStreamSourceFactory.cc \
../../source/audio/wavStreamSource.cc \
../../source/component/dynamicConsoleMethodComponent.cpp \
../../source/component/simComponent.cpp \
../../source/component/behaviors/behaviorComponent.cpp \
@@ -299,10 +301,11 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/platform/platformFileIO.cc \
../../source/platform/platformFont.cc \
../../source/platform/platformMemory.cc \
../../source/platform/platformNetwork_ScriptBinding.cc \
../../source/platform/platformNet.cpp \
../../source/platform/platformNetAsync.cpp \
../../source/platform/platformNet_ScriptBinding.cc \
../../source/platform/platformString.cc \
../../source/platform/platformVideo.cc \
../../source/platform/platformNetAsync.unix.cc \
../../source/platform/menus/popupMenu.cc \
../../source/platform/nativeDialogs/msgBox.cpp \
../../source/platform/Tickable.cc \
@@ -320,7 +323,6 @@ SOURCES := ../../source/2d/assets/AnimationAsset.cc \
../../source/platformX86UNIX/x86UNIXMemory.cc \
../../source/platformX86UNIX/x86UNIXMessageBox.cc \
../../source/platformX86UNIX/x86UNIXMutex.cc \
../../source/platformX86UNIX/x86UNIXNet.cc \
../../source/platformX86UNIX/x86UNIXOGLVideo.cc \
../../source/platformX86UNIX/x86UNIXOpenAL.cc \
../../source/platformX86UNIX/x86UNIXProcessControl.cc \
@@ -1,5 +1,5 @@
# I release this sample under the MIT license: free for any use, provided
# you hold me harmless from any such use you make, and you retain my
# you hold me harmless from any such use you make, and you retain my
# copyright on the actual sources.
# Copyright 2005 Jon Watte.

@@ -79,27 +79,27 @@ LIB_TARGETS_DEBUG += $(TARGET_ljpeg_DEBUG)
OBJS_ljpeg := $(patsubst ../../lib/ljpeg/%,Release/ljpeg/%.o,$(SOURCES))
OBJS_ljpeg_DEBUG := $(patsubst ../../lib/ljpeg/%,Debug/ljpeg/%.o,$(SOURCES))

# Deriving the variable name from the target name is the secret sauce
# Deriving the variable name from the target name is the secret sauce
# of the build system.
#
$(TARGET_ljpeg): $(OBJS_ljpeg)
@echo Linking library ljpng
@echo Linking library ljpng
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ljpeg)

$(TARGET_ljpeg_DEBUG): $(OBJS_ljpeg_DEBUG)
@echo Linking debug library ljpng
@echo Linking debug library ljpng
@mkdir -p $(dir $@)
ar cr $@ $(OBJS_ljpeg_DEBUG)

Release/ljpeg/%.o: ../../lib/ljpeg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_ljpeg) $< -o $@

Debug/ljpeg/%.o: ../../lib/ljpeg/%
@mkdir -p $(dir $@)
$(CC) -c $(CFLAGS_DEBUG_ljpeg) $< -o $@

release_ljpeg: $(TARGET_ljpeg)
debug_ljpeg: $(TARGET_ljpeg_DEBUG)

Oops, something went wrong.

0 comments on commit cbe9694

Please sign in to comment.