Daniel Buckmaster
47dbce1499
Merge pull request #632 from eightyeight/better-explosion-example
...
Added a better example of using Explosion in a client/server fashion
2014-05-11 13:22:28 +10: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
f69eccfdb4
Merge pull request #600 from BeamNG/rename_Status
...
Rename Status enum for avoid conficts on Linux.
2014-05-10 11:01:28 +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
Andrew Mac
704dc47bdb
Merge pull request #602 from Azaezel/Simpler_ShapeBase1
...
removes non-functional shield and invincibility functionality.
2014-05-08 23:39:33 -03:00
bank
5c986f755a
Fix: Bit shifting of the 32-bit value with a subsequent expansion to the 64-bit type.
...
We now shift the 64-bit value, which is now treated correctly.
2014-05-06 15:39:24 +04: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
a7756b5591
Renamed local variable so it doesn't interfere with the provided argument.
...
String errorStr should be filled in only when ::preload returns false.
2014-05-06 15:35:52 +04:00
bank
b0fcc91058
Fix: removed 'virtual' for classes which doesn't have child.
2014-05-06 12:40:47 +04:00
bank
e7fb6a54de
Fix: Added missing virtual destructors for classes with virtual functions.
2014-05-06 12:40:46 +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
bank
c7a5a12080
Fix wrong check for bits (using '&&' instead of '&').
2014-05-06 12:40:44 +04:00
bank
15bad30b2c
Fix: Underflow of the buffer 'ctx'.
...
memset function should not receive sizeof of the pointer.
2014-05-06 12:40:43 +04:00
bank
9f2d44966e
Fix: Some compilers do not auto-cast String and Path classes to (char *).
2014-05-06 12:40:43 +04:00
bank
e6673eaf30
Fix: the string literal is implicitly casted to the bool type.
2014-05-06 12:40:42 +04:00
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
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
