Commit graph

3314 commits

Author SHA1 Message Date
OTHGMars
bab3d9d5f3 Fix for bug in GFXVideoMode::parseFromString()
When testing PR #2264 I discovered that GFXVideoMode::parseFromString() will never assign false to the fullScreen value. That value must be initialized to false going in. I found it hard to believe that that could be the case and not have caused a problem before now, so I dropped:
```c++
   GFXVideoMode vmTest = GFXInit::getDesktopResolution();
   vmTest.fullScreen = true;
   vmTest.parseFromString("800 600 false 32 60");
   Con::printf("%s becomes %s", "800 600 false 32 60", vmTest.toString().c_str());
```
into the end of _GFXInitGetInitialRes() and the output string is:
800 600 false 32 60 becomes 800 600 true 32 60 0

None of the values get assigned by the macro [here](https://github.com/GarageGames/Torque3D/blob/development/Engine/source/gfx/gfxStructs.cpp#L46-L48) if their function evaluates to zero or the token is missing from the string. This commit corrects that for the boolean case to only skip the assignment if the string token is not found.
2018-07-07 02:23:59 -04:00
Areloch
ee9f3b74ec Merge pull request #2254 from rextimmy/sdl_2_0_8
SDL 2.0.8
2018-05-30 20:37:00 -05:00
Areloch
5a1af9ccd7 Merge pull request #2236 from Azaezel/memberMess
cleans up all 'hides' warnings (at time of writing)
2018-05-30 20:36:43 -05:00
Areloch
833fb6c970 Merge pull request #2251 from rextimmy/openal_soft_update
openal-soft updates
2018-05-19 21:34:19 -05:00
Tim
ad5d781cef cmake fix for apple sdl 2018-05-09 23:09:32 +10:00
Tim
ec8f56b3b0 sdl 2.0.8 update 2018-05-09 23:09:05 +10:00
rextimmy
925d8b27cf openal-soft updates 2018-05-09 20:48:18 +10:00
Areloch
d6f6bc65a5 Merge pull request #2243 from CouleeApps/high-res-icon
Higher resolution app icon
2018-05-02 10:38:21 -05:00
Areloch
8230f8ed7c Merge pull request #2233 from CouleeApps/better-return-buffer
Use a circular buffer for getReturnBuffer to prevent buffer cloberring
2018-05-01 23:29:25 -05:00
Areloch
18edce6b2e Merge pull request #2092 from Azaezel/AIAimpoint
adds fallbacks to the aiTurret's scannode to operate similar to the aimNode
2018-04-30 23:40:15 -05:00
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
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
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