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

3423 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch bf170ffbca WIP of assimp integration. 2019-02-08 16:25:43 -06:00
Areloch 32c7f2c7a7 Merge pull request #2286 from Azaezel/NFD_Update 
Nfd update
 2019-02-01 19:34:38 -06:00
Areloch 9afb5e5105 Merge pull request #2298 from jmdejong/traviscompile 
Travis Compile
 2019-02-01 19:34:21 -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
Areloch 4d400bb206 Merge pull request #2296 from CouleeApps/patch-1 
Fix SDL Input::getKeyCode on software keyboard layouts
 2019-01-21 15:14:19 -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
troido 1226acc318 travis test whether compilation works on mac and linux 
This checks both gcc and clang on linux, but only clang on mac

Becuse there are so many debug warnings they are supressed in a very hacky way:
Make is run first with error output ignored.
Then an incremental build is run which has the error output, but will only build the files that errored the first time (and will error again).
If anyone knows a better way to ignore the warnings that would be great.
 2019-01-10 12:39:27 +01: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
Azaezel 9a7ae06721 tabspace 2019-01-06 15:50:19 -06:00
Azaezel 7900783163 constant consistency creates continuums 2019-01-06 15:42:18 -06:00
Azaezel 6ee436382f zenity backend file filter fix 2019-01-06 14:24:33 -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
Areloch cb8b993953 Merge pull request #2288 from Azaezel/unixUpdates 
corrects compilation errors on non-mac unix derivatives
 2019-01-06 02:12:45 -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 14836daa89 linux compilation, defaults to using the older gtk solution till more folks have a chance to beat up the zenity one. 2019-01-01 15:40:44 -06:00
Azaezel 13ce1a7441 corrects compilation errors on mac 2019-01-01 13:11:46 -06:00
Azaezel 300abf0ecd blacklist updated to filter out the new zenity backend when on windows. likely need to do the same on mac and potentially resolve conflicts on linux 2019-01-01 11:00:05 -06:00
Azaezel b0aa733c4e NFD updated to 1.1.4 2019-01-01 10:58:53 -06:00
Areloch 3d94cb5b93 Merge pull request #2285 from Azaezel/method_Unmangle 
corrects a pair of conversions. one object oriented, one not.
 2018-12-13 09:38:59 -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 c8d685d8c4 Merge pull request #2103 from Areloch/ConvexProxies 
Adds functionality to automate convex proxy objects
 2018-12-09 15:34:22 -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 25aa766234 Merge pull request #2245 from lukaspj/EngineAPI-Refactor 
Clean-up uses of ConsoleFunction etc.
 2018-12-09 14:49:10 -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 e2f0fbcd2b Merge pull request #2270 from Azaezel/NDFnoHide 
micro patch to the nativefiledialogues library to mirror file type name
 2018-10-12 00:41:19 -05:00
Areloch 2721732b5c Merge pull request #2272 from Areloch/CoreModuleification 
Core module-ification
 2018-10-12 00:39:48 -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