Commit graph

3720 commits

Author SHA1 Message Date
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
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
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
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
Azaezel
8d90558279 removes non-functional shield and invincibility functionality. 2014-04-07 16:11:32 -05: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
Thomas Fischer
32abd2c149 Merge pull request #553 from signmotion/add-vector-reverse
Added method Vector::reverse().
2014-03-22 21:51:30 +01:00
Azaezel
52ef23d0ec clipping the lighting result via ciel was causing banding issues with specular maps with alpha channels. rev2. also addresses the warning:
"warning X3571: pow(f, e) will not work for negative f, use abs(f) or conditionally handle negative values if you expect them" since it was coming from the same line
2014-03-18 05:52:54 -05:00
Thomas Fischer
29d7fe310d Merge pull request #583 from tdev/x64_basics
windows 64 bit basics
2014-03-18 00:51:58 +01:00
Thomas Fischer
7239c791f2 Merge pull request #581 from tdev/vs2012_fixes
Visual Studio 2012 32Bit Level 4 Warning fixes
2014-03-17 10:02:19 +01:00
Thomas Fischer
fec4cc8acd Merge pull request #538 from Azaezel/Tangent_Basis_Floor
Tangent Basis Cleanup
2014-03-17 00:12:03 +01: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
LuisAntonRebollo
e22d8156b4 Merge pull request #582 from tdev/RenderInstConstructor
RenderInstType default constructor improvements
2014-03-16 14:08:39 +01:00
Thomas Fischer
5a1747c534 Merge pull request #577 from tdev/main_unicode
main working on unicode systems
2014-03-16 13:58:08 +01:00
Thomas Fischer
8529d4450b Merge pull request #546 from asmaloney/minor_cleanup
Minor cleanups
2014-03-15 15:20:23 +01:00
Thomas Fischer
1ce77dc619 Merge pull request #561 from signmotion/filesystem-correct-docs
Corrected docs for scripts in the group FileSystem: fileBase() and fileName().
2014-03-15 15:16:28 +01:00
Thomas Fischer
022b15720b Merge pull request #548 from asmaloney/more_fixes
More fixes
2014-03-15 15:14:11 +01:00
Thomas Fischer
6d8e0d7e25 refactored platform precompiler variable: TORQUE_OS_WIN{32,64,} 2014-03-15 15:10:14 +01:00
Thomas Fischer
47a2cc165a moved header file to have a more meaningful naming 2014-03-15 14:05:30 +01:00
Thomas Fischer
e37ecb0567 fixed WIN64 precompiler flags up - basics 2014-03-15 13:43:48 +01:00
Thomas Fischer
b1c52f8bb1 Added identify the CPU x64. 2014-03-15 13:23:49 +01:00
Thomas Fischer
8c25dc8b18 reverted fileno change, MSVS specific API changes follow in another PR 2014-03-15 12:57:47 +01:00
Thomas Fischer
489106ae5e replaced UNUSED and assert combination by a fixed up assert macro - thanks luis! :) 2014-03-15 12:50:38 +01:00
Thomas Fischer
004f04660b refactored the constructor to not use a default reference to a static member 2014-03-15 12:26:51 +01:00
Thomas Fischer
2844ab6912 more VS2012 L4 warning fixes 2014-03-15 11:51:36 +01:00
Thomas Fischer
502e346eb6 visual studio 2012 Level 4 warning fixes 2014-03-15 11:38:53 +01:00
Thomas Fischer
835649aa2f Merge pull request #547 from asmaloney/fix_potential_crashes
Fix potential crashes
2014-03-15 10:57:21 +01:00
Daniel Buckmaster
9921786b9c Merge pull request #563 from signmotion/smallestVisiblePixelSize-work
Fixed issue #256: "$pref::TS::smallestVisiblePixelSize doesn't work".
2014-03-15 20:00:14 +11:00
Thomas Fischer
e906865a56 Merge pull request #570 from eightyeight/box3f-overlap
Fixed Box3F::overlap
2014-03-15 09:15:12 +01:00