Commit graph

3356 commits

Author SHA1 Message Date
Areloch
de67b30edc Merge pull request #2104 from OTHGMars/ScaleCollision
Sets scale for collision primitives created in the shape editor.
2018-04-30 23:39:33 -05:00
Areloch
1f2847bc11 Merge pull request #2108 from Azaezel/reskinRedux
allows for arbitrary reskinning
2018-04-30 23:37:36 -05:00
Areloch
cd0bc17bfe Merge pull request #2193 from John3/bullet_2_87
bullet 2.87 update
2018-04-30 23:35:50 -05:00
Areloch
c894820eea Merge pull request #2194 from John3/libogg_133
update to libogg v133
2018-04-30 23:08:08 -05:00
Areloch
a7107744f3 Merge pull request #2204 from Azaezel/badPrefabEntryHandling
don't try to physically interact with a prefab with invalid entries
2018-04-30 23:06:24 -05:00
Areloch
d03055e5e9 Merge pull request #2214 from John3/update_Recast_5d41860
Update recast
2018-04-30 23:05:26 -05:00
Areloch
b0aa95cf8b Merge pull request #2231 from Areloch/AFXBinFix
Includes some renderbin declarations that are needed for AFX
2018-04-30 22:58:59 -05:00
Areloch
903995ee34 Merge pull request #2232 from Azaezel/phyzZonePhun
PhysicalZone editing-display tools.
2018-04-30 22:58:38 -05:00
Areloch
c44457397f Merge pull request #2234 from Areloch/DeprecatedMSVCFix
Remove a now-unneeded fix for offsetof on new versions of Visual Studio.
2018-04-30 22:52:48 -05:00
Areloch
46a233b3ce Merge pull request #2235 from CouleeApps/fix-dump-console
Fix dumpConsoleClasses / dumpConsoleFunctions
2018-04-30 22:52:30 -05:00
Areloch
21123bdc2f Merge pull request #2237 from JeffProgrammer/codeinterpreter_cleanup
Small Cleanup to CodeInterpreter
2018-04-30 22:52:12 -05:00
Areloch
287586469e Merge pull request #2242 from JeffProgrammer/ts_thisoptimization_hotfix
Interpreter Hotfix: Check for NULL on the thisObject before using it.
2018-04-30 22:51:52 -05:00
OTHGMars
1098891565 Updates PlatformCursorController to use full set of SDL cursors.
Adds support for the SDL_SYSTEM_CURSOR_WAITARROW and SDL_SYSTEM_CURSOR_NO.
2018-04-27 21:44:04 -04:00
Azaezel
13334b4d5c Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/sfx/sfxSystem.cpp
2018-04-23 10:08:14 -05:00
rextimmy
96c71a4d5d Corrects a problem with the D3D11 texture lock/unlock mechanism 2018-04-21 18:19:17 +10:00
Areloch
bc1b506205 Merge pull request #2146 from Azaezel/specializationShenanigans
changes find, swap, for_each, and delete_pointer from global to t3d namespace
2018-04-17 03:02:03 -05:00
Glenn Smith
cecf109f93 Higher resolution torque icon, 1024x1024 for macOS, 256x256 for Windows. 2018-04-14 17:51:29 -04:00
Jeff Hutchinson
c6ec1f8d86 Added better script interpreter logging. 2018-04-14 10:59:09 -04:00
Jeff Hutchinson
c75eecbf53 fix this pointer in op_callfunc_this 2018-04-12 23:14:57 -04:00
Jeff Hutchinson
12134ceb2b Check for NULL on the thisObject before using it. Also cleanup break to goto. 2018-04-10 22:21:40 -04:00
Areloch
aed16d38cb Merge pull request #2238 from Areloch/SDL_Install_Fixup
Makes it so the SDL directory files aren't copied during a template install.
2018-04-05 00:24:36 -05:00
Areloch
570c6844f9 Makes it so the SDL directory files aren't copied during a template file install. 2018-04-03 23:58:03 -05:00
Azaezel
11064fb1dc stray fork contamination cleanup 2018-04-02 23:58:54 -05:00
Jeff Hutchinson
5d8b367de8 Remove unused variables and cleanup precision warnings as dSprintf takes a U32 for the size of the buffer to use. 2018-04-02 23:38:17 -04:00
Azaezel
0e3c128ec4 slimmed down shadowvar cleanups, plus removal of an unused membervar. 2018-04-02 03:06:58 -05:00
Azaezel
0c316dab46 Revert "collada/ts chain shadowvar and member var clenaups"
This reverts commit 3ce15b33eb.
2018-04-02 03:01:52 -05:00
Azaezel
c386e90348 further membervar issue with PolyhedronFixedVectorData template found with clang. 2018-04-01 17:48:10 -05:00
Azaezel
b7a6f6140c afx effect-vector and phrase membervar cleanups 2018-03-30 02:54:48 -05:00
Azaezel
fa6b65a981 afx footswitch membervar cleanups 2018-03-30 02:53:07 -05:00
Azaezel
fa3839f11c afx point and spot light membervar cleanups 2018-03-30 02:52:22 -05:00
Azaezel
88cdf37f7d afx camera membervar cleanups 2018-03-30 02:51:44 -05:00
Azaezel
58f15d5235 a pair of afx audio-class membervar cleanups 2018-03-30 02:51:17 -05:00
Azaezel
4375e5f145 afx mooring membervar cleanups 2018-03-30 02:50:12 -05:00
Azaezel
e0b79d4dc8 afx staticshape membervar cleanups 2018-03-30 02:49:35 -05:00
Glenn Smith
b486ab73bd CodeBlock::getFunctionArgs used the wrong offsets 2018-03-30 02:28:04 -04:00
Glenn Smith
0ebd75604d Badly sized buffer in dumpConsoleClasses 2018-03-30 02:27:43 -04:00
Azaezel
17b627e05f afxforceset membervar cleanups 2018-03-29 19:40:34 -05:00
Azaezel
b6076c55dd afxEffectWrapper membervar cleanup 2018-03-29 17:46:57 -05:00
Azaezel
0df2cf1b9d afx magic spell membervar cleanup (plus an additional shadowvar one in magic missile) 2018-03-29 03:41:34 -05:00
Azaezel
8353d87a49 afx path 3d membervar cleanup 2018-03-29 03:40:24 -05:00
Areloch
ec4043604e Remove a now-unneeded fix for offsetof on new versions of Visual Studio. 2018-03-29 00:44:10 -05:00
Azaezel
f068664742 gamebase mmebervar cleanups. mPacked in particular is likely to geta followup for other cleaning. 2018-03-28 23:41:47 -05:00
Azaezel
fa2b0761a7 more afx constraint mmebervar cleanups 2018-03-28 23:37:19 -05:00
Areloch
918509d59a Merge pull request #2225 from Azaezel/defineDistaste
stop linux/mac  undefined MSVC versioncheck spam.
2018-03-28 21:38:40 -05:00
Glenn Smith
18dee487f9 Use a circular buffer for getReturnBuffer because StringStack's would get clobbered too quickly 2018-03-28 20:55:09 -04:00
Glenn Smith
593680fb3f Move StringStack methods into the cpp file 2018-03-28 20:52:10 -04:00
Azaezel
adb60f81df afx constraint membervar cleanups 2018-03-28 18:39:59 -05:00
Azaezel
1aa6ace486 afx wave scalar and color membervar cleanups 2018-03-28 17:54:49 -05:00
Azaezel
9fbeb3e2d0 void ColladaUtils::ExportData::processData() var clarifications 2018-03-28 17:50:17 -05:00
Azaezel
cbce2ee805 Merge branch 'development' of https://github.com/GarageGames/Torque3D into memberMess
# Conflicts:
#	Engine/source/console/consoleFunctions.cpp
2018-03-28 15:42:34 -05:00