TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-21 05:04:45 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
3423 commits 5 branches 33 tags 958 MiB
Commit graph

2317 commits

Author SHA1 Message Date
Areloch bf170ffbca WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch a77eb37f9a Merge pull request #2292 from Azaezel/highlightHax 
afxRenderHighlightMgr: account for hardware skinning
 2019-01-21 15:18:19 -06:00
Areloch 8717c6a376 Merge pull request #2300 from OTHGMars/SDL_Joystick2 
Sdl joystick2
 2019-01-21 15:17:31 -06:00
Areloch 72af45ef69 Merge pull request #2294 from OTHGMars/GuiInputCtrl 
Adds features to GuiInputCtrl
 2019-01-21 15:14:37 -06:00
OTHGMars 3af77bbf15 Adds support for SDL joystick and game controllers. 2019-01-10 20:09:05 -05:00
OTHGMars 0ae675839e Adds event codes for 2 POV hat masks, 2 trackballs and the guide button. 2019-01-10 20:06:54 -05:00
OTHGMars 2add57079d Updated to work without keyboard event refactor. 2019-01-10 17:44:30 -05:00
Glenn Smith a78235dd06 Fix Input::getKeyCode on software keyboard layouts 
Input::getAscii goes Torque keyCode -> SDL Scancode -> SDL Keycode -> SDL ascii key name
Input::getKeycode used to be SDL ascii key name -> SDL Scancode -> Torque keyCode

This mismatch made software keyboard layouts behave incorrectly in different places. For example, you would bind a key to an ActionMap and it would activate with a different button than specified.
 2019-01-10 04:15:22 -05:00
Areloch 8633884145 Merge pull request #2287 from Azaezel/macUpdates2 
corrects compilation errors on mac
 2019-01-09 09:42:19 -06:00
Brian Roberts 6e4ed303f6 Update afxRenderHighlightMgr.cpp 2019-01-07 11:41:17 -06:00
Azaezel 7939d08c6a afxRenderHighlightMgr: account for hardware skinning 2019-01-07 06:22:24 -06:00
Areloch d74a25540f Merge pull request #2282 from OTHGMars/CanvasResize 
Fixes CanvasSizeChangeSignal and Canvas::onResize()  under SDL
 2019-01-06 04:51:18 -06:00
Azaezel 547a2e28eb no message 2019-01-02 17:53:17 -06:00
Azaezel 94fe66a451 use the newer c_controlInterface file 2019-01-02 17:52:20 -06:00
Azaezel be4cf58fb8 corrects compilation errors on non-mac unix derivatives 2019-01-01 15:41:59 -06:00
Azaezel 13ce1a7441 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel a7fc407284 corrects a pair of conversions. one object oriented, one not. 2018-12-12 14:52:14 -06:00
Areloch 58cf310971 Merge pull request #2284 from OTHGMars/SDLMonitor 
Fills in monitor functions in PlatformWindowManagerSDL
 2018-12-09 15:36:15 -06:00
Areloch 368a0041d1 Merge pull request #2283 from OTHGMars/SDLFocus 
Adds handlers for sdl focus events.
 2018-12-09 15:36:00 -06:00
Areloch 121ca2ac97 Merge pull request #2258 from Areloch/OthroCameraFix 
Fixes the front/back ortho views in the editors
 2018-12-09 15:35:38 -06:00
Areloch bb30de04f7 Merge branch 'development' into ConvexProxies 2018-12-09 15:34:12 -06:00
Areloch 900816fcd0 Merge pull request #2186 from rextimmy/physx_3_4 
Physx 3.4
 2018-12-09 15:28:43 -06:00
Areloch cbc09534e4 Merge pull request #2248 from lukaspj/new-cinterface 
New cinterface
 2018-12-09 15:28:22 -06:00
Areloch 644f4071ed Merge pull request #2246 from lukaspj/update-cinterface 
Update CInterface
 2018-12-09 15:24:29 -06:00
Areloch ad2493bef2 Merge pull request #2228 from lukaspj/fix-enginexmlexport 
Make EngineAPI Export work properly
 2018-12-09 14:52:27 -06:00
Areloch 6cf0c9e360 Merge branch 'development' into EngineAPI-Refactor 2018-12-09 14:48:50 -06:00
Areloch 87efea9683 Merge pull request #2276 from Azaezel/terrainNormalNeener 
filter out pixel shader normalmap calcs when not in deferred mode.
 2018-12-02 10:50:52 -06:00
OTHGMars 49fa248ec4 Fills in monitor functions in PlatformWindowManagerSDL 
Adds the sdl implementation for all used PlatformWindowManager monitor functions. [This unit test](https://github.com/GarageGames/Torque3D/blob/development/Engine/source/windowManager/test/windowManagerTest.cpp#L28) will now pass for the SDL platform. Here is the equivalent in TorqueScript to test the functions via the Canvas object:```//Canvas.listDisplays();
function Canvas::listDisplays(%this)
{
   %count = %this.getMonitorCount();
   echo(%count SPC "monitor(s) detected.");
   for (%i = 0; %i < %count; %i++)
   {
      echo("Monitor #" @ (%i + 1) SPC %this.getMonitorName(%i) @ ": " @ %this.getMonitorRect(%i));
   }
}```
 2018-11-24 03:12:07 -05:00
OTHGMars af24739137 Adds handlers for sdl focus events. 2018-11-23 16:03:00 -05:00
OTHGMars 4c96c8cea7 Fix CanvasSizeChangeSignal and Canvas::onResize() callback for SDL Window. 2018-11-17 05:51:47 -05:00
Brian Roberts 4453a4ad4b Update terrFeatureHLSL.cpp 2018-10-29 13:22:16 -05:00
Brian Roberts 6ba442bf07 Update terrFeatureGLSL.cpp 2018-10-29 13:21:42 -05:00
Areloch c5a2734db6 Merge pull request #2267 from calvinbalke13/feature-netcode-fix 
Network Code Fixes
 2018-10-12 00:39:26 -05:00
Areloch 426b0fcbfe Merge pull request #2275 from OTHGMars/ClampQuatDot 
Adds Clamp to QuatF::dot()
 2018-10-11 16:14:40 -05:00
OTHGMars e3793184b6 Improved BitStream writeQuat/readQuat methods. 
Replaces the writeQuat/readQuat implementations with one that utilizes smallest three compression.
 2018-10-06 03:29:15 -04:00
Azaezel 2c0a57449e filter out pixel shader normalmap calcs when not in deferred mode. 2018-09-26 06:49:36 -05:00
OTHGMars 2ed30ffeae Adds Clamp to QuatF::dot() 
Clamps output of QuatF::dot() to [-1, 1].
 2018-09-24 18:56:46 -04:00
Areloch 54f1d8c18e Merge pull request #2250 from Areloch/popupMenuFixesPR 
Fixes various incorrect popup menu behaviors.
 2018-09-05 13:06:26 -05:00
Areloch 3101637512 Merge pull request #2259 from OTHGMars/staticraycast 
Changes TSStatic::castRayRendered to use passed texcoord argument.
 2018-09-05 10:52:40 -05:00
Areloch 83a15ed827 Merge pull request #2249 from OTHGMars/MouseCursors 
Updates PlatformCursorController to use full set of SDL cursors.
 2018-09-05 10:48:17 -05:00
Azaezel ae5fce6169 alternative to #2268 : remove secondary profiling 2018-07-27 22:00:49 -05:00
OTHGMars b0455c7524 Adds features to GuiInputCtrl 
This commit adds three new features to the GuiInputCtrl. All three default to off, so it is fully backward compatible with existing scripts. The new options are:
sendAxisEvents – If true, the control will generate onAxisEvent() callbacks for all axis events. This is useful for binding joystick/controller axes to game actions.
sendBreakEvents – If true, the control will generate onInputEvent() callbacks for SI_BREAK events for all keys and buttons. By default the callback is only triggered for break events on modifier keys.
SendModifierEvents – If true SI_MAKE events for modifier keys will generate callbacks. By default, only the break events are sent for modifier keys.
 2018-07-18 20:35:59 -04:00
Calvin Balke cf156f5056 Network Code Fixes 
This should be backwards compatible with existing network code, however it fixes a bug.
 2018-07-15 11:50:09 -07:00
Areloch 471bdcaefe Merge pull request #2252 from pacomont/Allow_to_change_wind's_direction 
It's almost imposible to change direction of wind. Reseting mCurrentT…
 2018-07-12 15:42:51 -05:00
Areloch 11d9a13c6a 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 4cb701b0c3 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 a48b70d5b1 d3d11 copyToBmp fix for new lock/unlock function 2018-07-10 14:13:22 +10:00
Areloch 703ac27cf2 Merge pull request #2265 from OTHGMars/vmParseFromString 
Fix for bug in GFXVideoMode::parseFromString()
 2018-07-09 13:56:12 -05:00
Areloch 3644396b2e 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 222623e0bf 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