Commit graph

1215 commits

Author SHA1 Message Date
Duion
373faa2d17 corrects projection matricies for opengl - from Azaezel 2016-04-06 15:07:40 +02:00
Duion
9338e032b5 Version change to 1.0.5.0 2016-04-03 21:04:26 +02:00
Duion
1f1851c0d4 Merge branch 'ueberengine-master' into ueberengine-dev 2016-03-15 22:47:30 +01:00
Duion
7565447d63 resource integration: "setting image state manually" 2016-03-15 12:25:53 +01:00
Duion
3746093efd ground plane zOffset feature 2016-03-15 01:01:31 +01:00
Duion
1ae043bc90 decal lifetime option functionality added 2016-03-10 17:51:26 +01:00
Duion
b8d462e22e Merge pull request #3 from ZOD2015/ueberengine-dev
Teams implementation
2016-02-09 23:01:31 +01:00
Duion
8cf2deb300 Merge branch 'ueberengine-dev' into ueberengine-master 2016-01-15 02:32:16 +01:00
Duion
2fc35bad99 version change to 1.0.4.0 2016-01-15 02:30:02 +01:00
Duion
d1d1d4fdd8 Merge branch 'ueberengine-dev' of https://github.com/Duion/Torque3D.git into ueberengine-dev 2016-01-13 02:36:03 +01:00
Duion
b37bbf2d05 Dedicated server fixes I think 2016-01-13 02:27:42 +01:00
Duion
03d6ca749b make crosshair show in third person 2016-01-12 23:55:54 +01:00
Duion
79c6a25050 multiplayer decals and art/core filepaths fixes 2015-12-27 00:39:52 +01:00
ZOD
e471c96014 Teams implementation
Add team functionality to shapebase objects
2015-11-28 11:32:40 -05:00
Duion
a6297e2c32 extra option for terrain block to disable the update of the basetexture
file
2015-10-14 00:01:14 +02:00
Duion
aa6d9b8ec2 version change to 1.03 2015-10-07 23:46:38 +02:00
Duion
3831cd6ccf Merge branch 'GarageGames/master' into ueberengine-dev 2015-10-06 23:46:47 +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
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
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
Areloch
e8d1238794 Merge pull request #1411 from Azaezel/textEditReversion
void GuiTextEditCtrl::execConsoleCallback() reversion
2015-09-17 18:35:28 -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
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
Duion
9b8114d4e1 Undo TorqueLab changes until it works properly 2015-09-06 23:14:36 +02:00
Areloch
5874b8db59 Merge pull request #1380 from Azaezel/C4946
partly addresses C4946 warnings
2015-09-04 21:23:44 -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
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
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
Azaezel
1df7e47a89 From @LuisAntonRebollo -Stymies infinite loop on exit with SDL2+opengl on windows. 2015-08-13 15:34:41 -05:00
Azaezel
7df625ea14 Adds data to vector out of bounds reports
Like say, if it's crashing out due to being passed a -1, or adding past the end.
2015-08-12 16:17:08 -05:00
Azaezel
ac515a9ab1 release the mouse from window constraints when poping up a window prompt
like, say, assertfatal, to allow clicking in the popup.
2015-08-10 21:54:30 -05:00
Areloch
9782490894 Merge pull request #1388 from Areloch/SDL_Scroll_Speed_Fix
SDL mouse wheel speed fix.
2015-08-10 08:44:15 -05:00
Daniel Buckmaster
c0e82d72a2 Merge pull request #1391 from Azaezel/C4706
warning C4706: assignment within conditional expression
2015-08-08 14:04:35 +10:00
Areloch
5efc04dd47 Also apply scroll strength to horizontal scrolling. 2015-08-06 22:18:10 -05:00
Azaezel
c100d7f932 suggested revision 2015-08-06 21:56:46 -05:00
Azaezel
5bc926e97c warning C4005: 'WIN32' : macro redefinition 2015-08-06 21:01:20 -05:00