TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-20 23:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3499 commits 5 branches 33 tags 959 MiB
Commit graph

3499 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch
51fa8a3b5b Merge pull request #1430 from Areloch/release-3.8 
Release 3.8
 2015-10-06 12:58:28 -05:00
wcb
3c252689f3 sfxCompareProvider fix for Empty template 2015-10-06 02:07:01 -04:00
wcb
183c468dda sfxCompareProvider fix for Full template 2015-10-06 02:05:34 -04:00
Azaezel
aa6d078c40 cuts the shadergen hashkey generator down from a 64 bit to a 32 bit key. 
(MacOSX 32 bit compatibilty errors. was generating 2k+ shader files. may also address  https://github.com/GarageGames/Torque3D/issues/1219)
 2015-09-30 22:51:59 -05:00
irei1as
1733ecc315 Updated normalize() 
It seems normalize() already changes the quaternion so the asignation is not needed.
 2015-09-29 16:13:01 +02:00
Areloch
2044b2691e Merge pull request #1426 from Azaezel/KrazyKeyKompares 
backend correction for https://github.com/GarageGames/Torque3D/pull/1425
 2015-09-27 17:55:21 -05:00
Areloch
f08e31346d Merge pull request #1421 from blackwc/cmake-nmake-fix 
CMake NMake fix to place exe in game directory
 2015-09-27 16:42:18 -05:00
Areloch
f6bf0282b8 Merge pull request #1423 from Areloch/SDL_menu_accelerator_fix 
SDL Menubar accelerator fix
 2015-09-27 16:41:57 -05:00
Areloch
7da2d6d9d2 Merge pull request #1416 from Areloch/SDL_Inputs_Fixup 
SDL Textbox bleedthrough inputs fix
 2015-09-27 16:41:48 -05:00
Areloch
9f7513dc0b Further fixes to work around certain accelerators being missed, and additional command bleed-through. 2015-09-27 15:43:47 -05:00
Azaezel
f87f7c41b6 backend correction for https://github.com/GarageGames/Torque3D/pull/1425 2015-09-25 17:09:41 -05:00
rextimmy
f128b45170 Changed order of fmodex library unload. 2015-09-25 22:40:24 +10:00
Areloch
3d65f1f8cd Fixes it so when using SDL, the editor menubar will correctly react to accelerator commands. 2015-09-24 22:23:26 -05:00
wcb
845ec9c452 CMake NMake fix to place exe in game directory 2015-09-23 19:46:36 -04:00
irei1as
3630f97ab1 mQuat.h change to fix QuatF::angleBetween 
The old version doesn't have that 2.0f in the return that seems to be needed.
Also added normalizing inside so it can be used for not-normalized quaternions too.
 2015-09-22 19:37:42 +02:00
Jeff Hutchinson
4baf410b4f remove GL_EXT_gpu_shader4 2015-09-22 00:57:40 -04:00
Areloch
4c13906865 Corrects input issues when typing into text fields and it bleeding through to player inputs. 2015-09-21 00:14:16 -05:00
Francisco Montañés García
a35d788fcc Fix for Issue #1415Move::Move() is not properly initializing bool trigger[MaxTriggerKeys]; 
from https://github.com/GarageGames/Torque3D/issues/1415
 2015-09-20 20:44:11 +02:00
Areloch
e8d1238794 Merge pull request #1411 from Azaezel/textEditReversion 
void GuiTextEditCtrl::execConsoleCallback() reversion
 2015-09-17 18:35:28 -05:00
Azaezel
27112c468a reversion for a4c09d1680 
To be honest, can't remember how I was intending to fix that, but this one's causing it to fail to profile twice in a row, so kill it with fire.
 2015-09-17 16:14:49 -05:00
Areloch
70c7a67456 Merge pull request #1409 from Azaezel/LinuxLongLoopiness 
U32 MRandomLCG::randI() was using longs
 2015-09-16 21:27:56 -05:00
Areloch
0798b80371 Merge pull request #1410 from Areloch/light_anim_brightness_fix 
Light animation brightness fix
 2015-09-16 21:27:44 -05:00
Areloch
5ba5092d44 Merge pull request #1402 from Azaezel/SoSensitive3 
Files caught by https://github.com/GarageGames/Torque3D/pull/1401
 2015-09-16 21:27:30 -05:00
Azaezel
1d442c9f84 void GuiTextEditCtrl::execConsoleCallback() reversion 
see https://github.com/GarageGames/Torque3D/issues/1408
 2015-09-16 12:55:27 -05:00
Areloch
6e1d031ecd Corrects light animation to adhere to the brightness level set in the light's params instead of sticking with the default 0-1 brightness range. 2015-09-15 19:56:35 -05:00
Azaezel
58ae331609 U32 MRandomLCG::randI() was using longs 
32 and 64 bit windows can handle that. 64 bit linux no likey mixing longs and ints.
 2015-09-09 15:22:19 -05:00
Areloch
82bafd9f35 Merge pull request #1407 from Areloch/Companion_PR_1398 
Companion PR to 1398
 2015-09-05 12:08:39 -05:00
Areloch
dd5f910b64 Companion PR to 1398 to add the change to the Empty template as well. 2015-09-05 12:07:47 -05:00
Areloch
ec2da8c1c8 Merge pull request #1398 from Duion/patch-1 2015-09-05 00:20:29 -05:00
Areloch
5874b8db59 Merge pull request #1380 from Azaezel/C4946 
partly addresses C4946 warnings
 2015-09-04 21:23:44 -05:00
Areloch
0074453831 Merge pull request #1406 from Areloch/Monkey_PR_w_Mergefix 
Monkey pr w mergefix
 2015-09-03 23:27:00 -05:00
Areloch
bedc79aacb Merges in Monkey's fixes PR with a resolution for a conflict 2015-09-03 22:58:57 -05:00
Areloch
b1d2ba8412 Merge pull request #1379 from Azaezel/C4189 
C4189 warning cleanups
 2015-09-02 19:46:28 -05:00
Areloch
4f1372a7f1 Merge pull request #564 from signmotion/chaotic-crash-decal 
Will go ahead and merge this in on the grounds that while it may not technically be possible to make this problem occur(at least no one seems to have been able to reproduce it), having the clamping of values is generally a smart move on principle and prevents even the weird outliers from happening.
 2015-08-29 20:05:27 -05:00
Areloch
0e42172651 Merge pull request #1404 from Areloch/DXTnm_OGL_2 
Companion PR to #719
 2015-08-29 14:03:55 -05:00
Areloch
5ee096de20 Added in explicit setting to vec2 in the shader functions per Az's suggestion, to avoid GLSL problems 2015-08-29 12:41:35 -05:00
Areloch
4c4a84099b Merge pull request #1375 from Areloch/Update1001 
Redux of Winterleaf's PR 1001, with the suggested updated values.
 2015-08-28 11:46:41 -05:00
Areloch
71c19a6151 Companion PR to #719 
Adds the OGL side. redoing it to make sure the PR history is clean.
 2015-08-28 00:27:08 -05:00
Areloch
95ab3a33a5 Merge pull request #719 from rextimmy/dxtnm-parallax-fix 
Fix to allow parallax mapping with dxtnm textures via the red channel.
 2015-08-27 23:59:20 -05:00
Areloch
6fe55b9f47 Merge pull request #1377 from Azaezel/hash_map 
From Dušan Jocić: convexDecomp vs2015+ compatibility patch
 2015-08-26 00:31:45 -05:00
Areloch
ac6bca6f13 Merge pull request #1394 from Azaezel/BarrierBreak 
release the mouse from window constraints when poping up a window prompt
 2015-08-24 19:03:52 -05:00
Areloch
b54f41e36d Merge pull request #1378 from Areloch/PVS_Cleanup_595 
Properly testing pointer vars aren't null before using them.
 2015-08-22 23:17:43 -05:00
Azaezel
8f8c17e997 optimization 2015-08-21 03:07:41 -05:00
Azaezel
240219c423 clarify var-usage via naming 2015-08-21 03:06:47 -05:00
Areloch
31afbedfb6 Merge pull request #1346 from eightyeight/fix-threadpool-tests 2015-08-21 00:07:55 -05:00
Areloch
740ac50434 Merge pull request #1401 from Azaezel/SoSensitive2 
Looks good, seemed to work fine.
 2015-08-19 22:05:54 -05:00
Azaezel
1107d23e23 git hates batch renames pt2 2015-08-18 06:22:57 -05:00
Azaezel
dd89f9b82a git hates batch renames pt1 2015-08-18 06:22:21 -05:00
Azaezel
a0aa826f16 Adds a verifyCompatibility method to the Win32FileSystem to report case-sensitivity issues 
-triggered during debug only
-still need to expand that to handle bad directories.
 2015-08-18 06:12:37 -05:00
Daniel Buckmaster
680f4442f0 Merge pull request #1399 from Areloch/PhysicsViz 
Adds a debug visualization mode for the active physics world.
 2015-08-15 19:51:18 +10:00