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

72 commits

Author SHA1 Message Date
Daniel Buckmaster f9cd778b3b Fixed tricky overloaded sfx* functions. 2014-12-24 10:04:44 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis. 
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
 2014-12-23 18:48:02 +11:00
Daniel Buckmaster 04ff04a95f Removed some unneccessary changes and made file name consistent. 2014-12-21 21:25:27 +11:00
Daniel Buckmaster 03f71a78c0 Added dStrIsEmpty and replaced some incorrect string comparisons. 2014-12-21 21:25:19 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod 
Conflicts:
	Engine/source/T3D/missionMarker.cpp
 2014-12-21 21:23:55 +11:00
LuisAntonRebollo 2f8d18c0c0 Merge pull request #929 from BeamNG/remove_old_opengl_code 
Remove unnecesary code for handle OpenGL.
 2014-11-30 02:22:24 +01:00
LuisAntonRebollo 07b0ea9ca6 Merge pull request #927 from BeamNG/setupgenericshader 
Add GFXDevice::setupGenericShader for fix render on non FFP.
 2014-11-30 02:22:13 +01:00
LuisAntonRebollo 1c95ce21d6 Merge pull request #608 from BeamNG/use_gfxdevice_setupgenericshaders 
Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines.
 2014-11-30 02:20:00 +01:00
LuisAntonRebollo f101fbe820 Remove unnecesary code for handle OpenGL. 2014-11-08 18:11:35 +01:00
LuisAntonRebollo cc16277ce6 Add GFXDevice::setupGenericShader for fix render on non FFP. 2014-11-08 17:59:36 +01:00
Vincent Gee 2f48f31a6f Fixed String comparisons. 2014-11-05 23:29:08 -05:00
Daniel Buckmaster 3082bb3adc Merge pull request #884 from GarageGames/development-3.6 
Version 3.6.2
 2014-11-05 20:28:01 +11:00
Vincent Gee 9907c4592e Fixed bad string compares and simdictionary 2014-11-04 19:51:13 -05:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster f6d54d810b Improve documentation on getCursorPos and fix cursorInControl. 2014-11-02 07:51:03 +11:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
 2014-10-14 15:09:11 +11:00
Daniel Buckmaster 346ad5bdaa Finished up splash screen implementation. 
* Added stub methods for non-Windows platforms
 * Move canvas show to after tools have loaded
 * Fix a tab
 2014-08-16 11:28:53 +10:00
Areloch 0878f005c0 Fixed the pure virtual function to be an empty one, which should resolve the linux build failure. 
Also tweaked the loading methodology to have the canvas by default assume it should force the window display as soon as it can. You can set the canvas to not do that when it's created via the new displayWindow variable.

This way, old templates and projects should work as normal without changes, while the new templates are built to take advantage of the nicer splash screen arrangement.
 2014-08-04 21:28:36 -05:00
Areloch c2da67d473 Fixes the splash screen so that it displays until the game has actually done initial setup and can display GUI elements. This prevents the ugly blank window just sitting there while the GUI loads. 2014-07-15 17:44:19 -05:00
Daniel Buckmaster cf5d48e6ef Merge pull request #665 from andr3wmac/multiformat 
Support for large lists of shape formats.
 2014-07-08 14:14:54 +02:00
Daniel Buckmaster b94679aebc Prevent call to dStrlen(NULL). 2014-06-17 16:01:25 +10:00
Daniel Buckmaster feec36731e Merge pull request #594 from LuisAntonRebollo/unit-tests-without-crash 
Increased stability Torque3D: unit-tests running without a crash.
 2014-06-16 10:57:04 +10:00
LuisAntonRebollo a90be04041 Merge pull request #687 from eightyeight/procedural-terrain-coverage 
Add coverage option to procedural terrain generator
 2014-06-15 11:31:40 +02:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console. 
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
 2014-06-11 13:09:55 +04:00
Daniel Buckmaster de6e5e20b7 Fix random number generation. 2014-06-09 22:59:16 +10:00
Daniel Buckmaster 05e6fbf3d6 Merge remote-tracking branch 'JackDavidson/master' into procedural-terrain-coverage 2014-06-09 21:43:57 +10:00
LuisAntonRebollo 18ba0646c0 Increased stability Torqu3D: unit-tests running without a crash. See the console.log after ran unitTest_runTests( "", true ). @signmotion 2014-05-25 16:50:19 +02:00
Thomas Fischer cd978039ac Merge pull request #635 from just-bank/engine-fixes 
Various engine fixes
 2014-05-23 14:09:00 +02:00
Andrew Mac eb74525a38 Added support for large lists of shape formats. Needed for assimp. 2014-05-21 14:50:44 -03:00
Daniel Buckmaster 1702573b78 Merge pull request #612 from GarageGames/platform-type-consistency 
Platform type consistency
 2014-05-10 11:40:40 +10:00
Daniel Buckmaster a42c92391a Merge pull request #601 from BeamNG/rename_GFXTextureProfile_None 
Rename enum GFXTextureProfile::None for avoid conficts on Linux.
 2014-05-10 11:01:18 +10:00
bank 6275942acb Fix GuiTreeViewCtrl: we should use the member var, removed local decl. 2014-05-06 15:39:22 +04:00
bank 6d176cf8db Rename local variable to prevent confusion with member variable. 2014-05-06 15:39:21 +04:00
bank 68b12981ae Fix: dSprintf should receive size of the buffer, not the size of the pointer. 
It was safe, as we are using static console return buffer,
which is large enough to hold enough data (default is 2048).
 2014-05-06 12:40:45 +04:00
JackDavidson 060b2a4e29 Commit to add "Coverage" option to procedural terrain generator 
This commit adds a "Coverage" option to the procedural terrain
generator. Allows mixing of textures. See
http://www.garagegames.com/community/blogs/view/22371 for more info.
This version has many improvements - coverage is now entered as a
percentage, accepts decimals, and doesn't have any bugs as far as I
know.
 2014-05-04 22:17:24 -07:00
LuisAntonRebollo 33742599b3 Use GFXDevice::setupGenericShaders for support non Fixed Fuction Pipelines. 
OpenGL and DirectX11 not support FFP, and GFDevice::disableShaders has not the necessary information to decide the shader to be used.

GFDevice::SetupGenericShaders is used instead of GFDevice::disableShaders.

GFDevice::disableShaders will be deprecated on T3D 4.0
 2014-04-13 17:57:40 +02:00
LuisAntonRebollo 7f46383eb5 Rename enum GFXTextureProfile::None for avoid conficts on Linux. 2014-04-07 00:03:52 +02:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
 2014-04-04 13:43:25 +11:00
Daniel Buckmaster 382569ccb5 Merge pull request #584 from klaussilveira/master 
Copy of PR #551 changed to target development.
 2014-03-17 09:07:35 +11:00
Cameron Porter 91c058ca8a When setting the field on a GuiInspectorField, check if the field is null before setting the docs. 2013-12-10 23:42:07 -06:00
Klaus Silveira 0d610b7aac Fixed missing check for highlighted font color on GUI icon button 2013-12-08 01:19:42 -02:00
SilentMike ef4cee7b17 Merge pull request #466 from eightyeight/mltext-default-reformat 
Added default parameter to GuiMLTextCtrl::addText
 2013-10-26 11:24:08 -07:00
DavidWyand-GG 2fc5adb536 PlaneReflector Support for Side-by-Side Rendering 
- The PlaneReflector class now supports side-by-side rendering.  This
does mean that while in this rendering style that all planar reflections
are rendered twice, as reflection is a screen space effect from the eye
point of view.
- Planar reflections now work in the Oculus Rift.
- Modified GuiTSCtrl::onRender() to move up where the rendering style is
defined to just before the reflection manager has its turn.
 2013-10-25 02:08:13 -04:00
Daniel Buckmaster dbb15ccf0b Reformat parameter defaults to true. 2013-08-13 14:36:06 +10:00
SilentMike 77bd934167 Merge pull request #424 from tdev/lock-checking 
Added checks for valid pointers after locking
 2013-08-11 22:14:16 -07:00
cpusci 7a8f46b19f Update for float, double and unsigned char, unsigned short, short, etc. char was left alone: read why here http://msdn.microsoft.com/en-us/library/cc953fe1.aspx 2013-08-04 16:58:59 -05:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Bloodknight 3d38dc60eb Increase terrain editor and painter max brush size to 256 x 256 2013-07-28 02:26:29 +01:00
Thomas Fischer 53abbe066d added checks for valid pointers after locking 2013-06-30 17:51:38 +02:00
David Wyand 2dcc7f0247 Merge pull request #310 from thecelloman/goodbyeDIF 
Remove Interior Object format (DIF)
 2013-04-20 13:44:11 -07:00