TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3334 commits 5 branches 33 tags 958 MiB
Commit graph

3334 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
1ea59ed7df
Merge pull request #2255 from pacomont/Particles_go_downwind 
Particles should go downwind (while windCoefficient >0)
 2018-07-12 15:34:35 -05:00
Areloch
e6e5e24d23
Merge pull request #2247 from rextimmy/d3d11_tex_lock_fix 
Corrects a problem with the D3D11 texture lock/unlock mechanism
 2018-07-12 15:17:49 -05:00
rextimmy
3b0c00498b d3d11 copyToBmp fix for new lock/unlock function 2018-07-10 14:13:22 +10:00
Areloch
57d18682b8
Create .travis.yml 
Initial travis CI config file push. Further calibration will be required to dial the settings in.
 2018-07-09 15:17:48 -05:00
Areloch
cc906b95c2
Merge pull request #2265 from OTHGMars/vmParseFromString 
Fix for bug in GFXVideoMode::parseFromString()
 2018-07-09 13:56:12 -05:00
Areloch
1c6ef2a6c8
Merge pull request #2264 from chaigler/cleanup_gfx_initial_init 
Resolves #740 - Remove redundant code in _GFXInitGetInitialRes()
 2018-07-09 13:51:57 -05:00
Areloch
2caa826cfd
Merge pull request #2262 from Azaezel/memberMess2 
member var conversion error that oddly didn't crop up till mac testing.
 2018-07-09 13:16:04 -05:00
Areloch
612d5ac334
Merge pull request #2266 from chaigler/scattersky_zoffset_fix 
Resolves #1721 - ScatterSky zOffset
 2018-07-09 12:14:32 -05:00
chaigler
eca331206f Fix for ScatterSky zOffset 
zOffset was mistakenly applied to wrong transform matrix. Fixes #1721.
 2018-07-07 13:16:46 -04:00
OTHGMars
e3f675768c 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
chaigler
8992744856 _GFXInitGetInitialRes() cleanup 
Removes unnecessary code that sets default video mode params. This is
already handled by the GFXVideoMode constructor. The settings are also
immediately overwritten by vm.parseFromString().

Resolves #740
 2018-07-05 14:19:05 -04:00
Azaezel
e290d9d82e member var conversion error that oddly didn't crop up till mac testing. 2018-07-04 18:26:14 -05:00
chaigler
9095f0ef44 Merge remote-tracking branch 'refs/remotes/GarageGames/development' into development 2018-06-30 08:10:38 -04:00
Areloch
561f010f2e
Merge pull request #2254 from rextimmy/sdl_2_0_8 
SDL 2.0.8
 2018-05-30 20:37:00 -05:00
Areloch
36db8eacc3
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
b39716d3d6
Merge pull request #2251 from rextimmy/openal_soft_update 
openal-soft updates
 2018-05-19 21:34:19 -05:00
Francisco Montañés García
07b76cbfb2 Particles should go downwind (while windCoefficient >0) 2018-05-09 18:24:21 +02:00
Tim
045ddfeb89 cmake fix for apple sdl 2018-05-09 23:09:32 +10:00
Tim
bfb08f9482 sdl 2.0.8 update 2018-05-09 23:09:05 +10:00
rextimmy
2bc1148963 openal-soft updates 2018-05-09 20:48:18 +10:00
Areloch
7f674a59c6
Merge pull request #2243 from CouleeApps/high-res-icon 
Higher resolution app icon
 2018-05-02 10:38:21 -05:00
Areloch
6a2393bf37
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
a482977ab8
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
2d03a29814
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
9b47463875
Merge pull request #2108 from Azaezel/reskinRedux 
allows for arbitrary reskinning
 2018-04-30 23:37:36 -05:00
Areloch
255295aec1
Merge pull request #2193 from John3/bullet_2_87 
bullet 2.87 update
 2018-04-30 23:35:50 -05:00
Areloch
f93df48abf
Merge pull request #2194 from John3/libogg_133 
update to libogg v133
 2018-04-30 23:08:08 -05:00
Areloch
4338bdc368
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
f5ee843a86
Merge pull request #2214 from John3/update_Recast_5d41860 
Update recast
 2018-04-30 23:05:26 -05:00
Areloch
02575e9c01
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
9920766a6a
Merge pull request #2232 from Azaezel/phyzZonePhun 
PhysicalZone editing-display tools.
 2018-04-30 22:58:38 -05:00
Areloch
c2755f64ca
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
7c74acfa1a
Merge pull request #2235 from CouleeApps/fix-dump-console 
Fix dumpConsoleClasses / dumpConsoleFunctions
 2018-04-30 22:52:30 -05:00
Areloch
532cc4ad1b
Merge pull request #2237 from JeffProgrammer/codeinterpreter_cleanup 
Small Cleanup to CodeInterpreter
 2018-04-30 22:52:12 -05:00
Areloch
829da9ceb2
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
59130078e2 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
395c7af5b6 Corrects a problem with the D3D11 texture lock/unlock mechanism 2018-04-21 18:19:17 +10:00
Areloch
037d089c4d
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
14d783f1be Higher resolution torque icon, 1024x1024 for macOS, 256x256 for Windows. 2018-04-14 17:51:29 -04:00
Jeff Hutchinson
babe32ae7b Added better script interpreter logging. 2018-04-14 10:59:09 -04:00
Jeff Hutchinson
188fba2049 fix this pointer in op_callfunc_this 2018-04-12 23:14:57 -04:00
Jeff Hutchinson
47b1990cb7 Check for NULL on the thisObject before using it. Also cleanup break to goto. 2018-04-10 22:21:40 -04:00
Areloch
31bedfd618
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
41aebd237d Makes it so the SDL directory files aren't copied during a template file install. 2018-04-03 23:58:03 -05:00
Azaezel
787192c4c9 stray fork contamination cleanup 2018-04-02 23:58:54 -05:00
Jeff Hutchinson
050d710580 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
f6b7d3711d slimmed down shadowvar cleanups, plus removal of an unused membervar. 2018-04-02 03:06:58 -05:00
Azaezel
c84bd23e17 Revert "collada/ts chain shadowvar and member var clenaups" 
This reverts commit 3ce15b33eb.
 2018-04-02 03:01:52 -05:00
Azaezel
43c3f75b14 further membervar issue with PolyhedronFixedVectorData template found with clang. 2018-04-01 17:48:10 -05:00
Azaezel
d2e8536a29 afx effect-vector and phrase membervar cleanups 2018-03-30 02:54:48 -05:00