TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-11 08:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2217 commits 5 branches 33 tags 961 MiB
Commit graph

2217 commits

This branch
This branch
All branches
Author SHA1 Message Date
bank
e7eab10ad5 Corrected the use of #pragma warning() 
We should use #pragma warning(push/pop) instead of (default: X)
 2014-05-06 12:40:41 +04:00
bank
ff3d72747e Fix FixedSizeVector() initialization. 
mArray[6] was never assigned (ownerless experssion).
 2014-05-06 12:40:40 +04:00
bank
b2e6895554 Fix: preload() method on datablocks should always set errorStr when returning false. 
Otherwise it will dump the previous error message (content of the errorStr).
 2014-05-06 12:40:40 +04:00
Lukas Jørgensen
9ebfd0f6b3 T2D style 'Stock colors' 
This commit implements stock colors as they are implemented in T2D.
It allows for using predefined stock colors e.g.:
``` %object.color = "OrangeRed"; ```
Instead of
``` %object.color = "255 69 0"; ```
 2014-05-06 09:26:01 +02: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
Andrew Mac
008e34eb8e Merge pull request #596 from Azaezel/vs2013 
VS2013 compatibility patch.
 2014-05-03 14:07:46 -03:00
Daniel Buckmaster
46c9122432 Added a better example of using Explosion in a client/server fashion. 2014-04-25 13:04:12 +10:00
Daniel Buckmaster
43895090fa Merge branch 'RenderMeshExampleMatFix' into development for PR #631 2014-04-25 12:57:00 +10:00
Kyrah Abattoir
d56952eaea FIX RenderMeshExample not having a material on mission start even if one was assigned to it in the mission file. 2014-04-25 00:39:20 +02:00
LuisAntonRebollo
881d578aae Fix crash on exit T3D when build with CMake. 
Process::_signalProcess is destroyed first, and then Win32WindowManager::~Win32WindowManager() try to remove from deleted Signal causing a crash.

SlotSignal handle this automatically.
 2014-04-23 21:17:15 +02:00
LuisAntonRebollo
0137c86765 Add SlotSignal for handle automatic disconnect on Signal or SignalSlot destruction. 
Example:

```
Win32WindowManager::Win32WindowManager()
{
   // Register in the process list.
   mOnProcessSignalSlot.setDelegate( this, &Win32WindowManager::_process );
   Process::notify( mOnProcessSignalSlot, PROCESS_INPUT_ORDER );

   // When Signal it's destroyed, all slots are disconected.
   // When a SignalSlot it's destroyed, it's disconected from Signal.
}

```
 2014-04-23 21:16:00 +02:00
Daniel Buckmaster
aca58356ee Merge pull request #615 from Areloch/Issue_437 
Fixed the crash when using glow material on billboard groundcover
 2014-04-18 11:09:10 +10:00
Daniel Buckmaster
66a73708ec Merge pull request #614 from lukaspj/UnnecessaryParamter 
Removed unnecessary parameter in a simObject getter method
 2014-04-18 10:50:45 +10:00
LuisAntonRebollo
bc80fbf966 Handle texel-pixel offset with diferents graphics APIs. 2014-04-17 20:33:51 +02:00
LuisAntonRebollo
086c6b5416 Add GFXShader::init with support for ordered vector of sampler names for shader. 2014-04-17 20:29:44 +02:00
LuisAntonRebollo
9221b4dd10 Update GLSL Shadergen. Not used on DX9. 2014-04-17 18:39:13 +02:00
LuisAntonRebollo
ba36617aec Add RenderPassData::mSamplerNames for OpenGL code. Not used on DX9. 2014-04-17 17:48:33 +02:00
LuisAntonRebollo
0f9bc89f32 Add RenderPassData::mSamplerNames for OpenGL code. Not used on DX9. 2014-04-17 17:40:21 +02:00
LuisAntonRebollo
cb8b8b7316 Use shader data for get sampler register in CloudLayer and BasicClouds. 2014-04-17 14:20:08 +02:00
LuisAntonRebollo
51aca89165 Fix ScatterSkyVertex::color declaration. 2014-04-17 13:37:23 +02:00
LuisAntonRebollo
3995b974ed Fix WaterObject TODO: Retrieve sampler numbers from parameter handles, see r22631. 2014-04-17 13:24:08 +02:00
LuisAntonRebollo
f12d8807a8 Add sampler names to ShaderData declarations necesary for OpenGL. 
ShaderData changes:
* OGLVertexShaderFile/OGLPixelShaderFile not used in DX9.
* samplerNames[?] not used in DX9.
 2014-04-17 11:30:54 +02:00
Areloch
4594a13740 Fixed the assert crash by making sure the glow material instance keeps the original material instance's user object 2014-04-16 10:43:37 -05:00
Lukas Jørgensen
9fbdf64bd9 Removed unnecessary parameter in a simObject getter method 2014-04-15 11:50:34 +02:00
LuisAntonRebollo
6aea37b407 Changes to GLSL files for OpenGL 2014-04-13 19:55:45 +02:00
LuisAntonRebollo
a8462b7fc3 Case-sensitive fixes on template script files for Linux. 2014-04-13 19:50:22 +02: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
Daniel Buckmaster
7ad5d15306 Merge pull request #593 from eightyeight/tc-status-icon 
Added build status icon to README.
 2014-04-08 17:03:53 +10:00
Azaezel
8d90558279 removes non-functional shield and invincibility functionality. 2014-04-07 16:11:32 -05:00
Daniel Buckmaster
e2dcde721d Merge pull request #597 from eightyeight/fix-vs2008 
Fix VS2008
 2014-04-07 08:25:38 +10:00
LuisAntonRebollo
7f46383eb5 Rename enum GFXTextureProfile::None for avoid conficts on Linux. 2014-04-07 00:03:52 +02:00
LuisAntonRebollo
4a17d6ceb0 Rename Status enum for avoid conficts on Linux. 2014-04-06 22:14:19 +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
2de459cb2e Remove use of 'auto' keyword. 2014-04-04 13:16:47 +11:00
Azaezel
59c755b5e5 Minimal requisite alterations for development head as of 02APR2014 for compilation purposes on VS2013. 2014-04-02 15:09:07 -05:00
LuisAntonRebollo
54fa2bcdab Merge pull request #540 from signmotion/default-keyboard-layout 
Added a default keyboard layout for launching the game.
 2014-03-29 14:20:30 +01:00
Daniel Buckmaster
68edd51410 Added build status icon to README. 2014-03-28 21:12:21 +11:00
Thomas Fischer
32abd2c149 Merge pull request #553 from signmotion/add-vector-reverse 
Added method Vector::reverse().
 2014-03-22 21:51:30 +01:00
Thomas Fischer
d53b9d515b Merge pull request #591 from Azaezel/clubbing_ciels 
revised #568. abs and max.
 2014-03-22 21:51:20 +01:00
Thomas Fischer
e965b6a182 Merge pull request #590 from tdev/cmake 
cmake buildsystem added
 2014-03-22 21:50:19 +01:00
Thomas Fischer
36cc041254 enforced setting the app name and fixed default-appname bugs 
added debug batch file for windows
improved project filters for executable: separated into engine and user sources
refactored version numbers, added them to the .rc file
changed /W2 to /W4
TORQUE_DEBUG,TORQUE_ENABLE_ASSERTS and TORQUE_DEBUG_GFX_MODE now automatically defined in debug mode
 2014-03-20 05:34:45 +01:00
Thomas Fischer
f3dbe07b9a main.cs configuring now (optional), fixed installation up, fixed application name up, fixed executable name, added configured torsion template 2014-03-19 18:17:35 +01:00
Thomas Fischer
cd727f7711 added lib template; added cleanup batch file; added game folder 2014-03-19 03:23:51 +01:00
Thomas Fischer
e93a5d9d74 little documentation fix 2014-03-19 02:43:52 +01:00
Thomas Fischer
3071700690 added more options, moved some to advanced 2014-03-19 02:41:06 +01:00
Thomas Fischer
27bbf4758e changed readme 2014-03-19 02:20:35 +01:00
Thomas Fischer
c5e41a61cb fixed projects with space in name 2014-03-19 02:15:00 +01:00
Thomas Fischer
5ffe7abee9 cmake improvements: correct build folder without installing, merged luis resource copy fix. fixed usage of the app name. added source folder to build configuration 2014-03-19 02:03:45 +01:00
Thomas Fischer
0dc0e70114 improved config format, eaiser to be used now 2014-03-18 20:12:13 +01:00
Thomas Fischer
444b12a670 cmake, better isolated :) 2014-03-18 13:27:25 +01:00