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

622 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Fischer
00bec88f39 Merge pull request #617 from BeamNG/ScatterSkyVertex_color_decl 
Fix ScatterSkyVertex::color declaration.
 2014-05-23 08:11:22 +02:00
Thomas Fischer
2434a82b67 Merge pull request #609 from BeamNG/templates_case_sensitive 
Case-sensitive fixes on template script files for Linux.
 2014-05-23 08:05:14 +02:00
Thomas Fischer
a665ac5d2b Merge pull request #610 from BeamNG/templates_glsl_files 
Changes to Templates GLSL files for OpenGL
 2014-05-23 07:56:55 +02:00
Thomas Fischer
4d7ffad284 Merge pull request #619 from BeamNG/gfxshader_init_ordered_samplers 
Add GFXShader::init with support for ordered vector of sampler names for shader.
 2014-05-23 07:54:24 +02:00
Thomas Fischer
c850d60a4f Merge pull request #621 from BeamNG/glsl_shadergen 
Update GLSL Shadergen.
 2014-05-23 07:52:35 +02:00
Thomas Fischer
76b70365e7 Merge pull request #662 from LuisAntonRebollo/cmake_missing_modules 
Fixes #625 - Cmake missing modules
 2014-05-23 07:46:28 +02:00
LuisAntonRebollo
62fc2a7e02 Small fixes for CMake modules/libraries. 2014-05-20 23:24:08 +02:00
LuisAntonRebollo
7240c121fc Fix CMake Navigation module. 2014-05-20 00:14:24 +02:00
LuisAntonRebollo
2f7e5bfb73 CMake Razor Hydra module. 2014-05-19 22:55:38 +02:00
LuisAntonRebollo
80f31c0068 CMake Oculus VR module. 2014-05-19 22:43:48 +02:00
LuisAntonRebollo
9ba72e13d4 CMake Navigation module. 2014-05-19 22:17:43 +02:00
LuisAntonRebollo
dca11afded Add support for CMake "required definitions" to modules and libraries. 2014-05-19 22:15:22 +02:00
LuisAntonRebollo
82a36d8a32 Add support for modules and libraries to CMake. 2014-05-19 21:44:01 +02:00
LuisAntonRebollo
c950ca2c77 Merge pull request #647 from Azaezel/debris_collision 
Debris collision
 2014-05-16 01:02:59 +02:00
LuisAntonRebollo
6f673e624d Merge pull request #641 from Azaezel/projectile_decal 
Projectile decal
 2014-05-16 00:27:42 +02:00
Azaezel
4e203f21b3 debris collision mask expanded so that it also hits buildings and the like. 2014-05-13 17:40:25 -05:00
Thomas Fischer
08e6b261a3 Merge pull request #628 from BeamNG/fix_cmake_crash_on_t3d_exit 
Fix crash on exit T3D when build with CMake.
 2014-05-13 09:12:33 +02:00
Daniel Buckmaster
7a517d3cb1 Merge pull request #613 from lukaspj/T2DColors 
T2D style 'Stock colors'
 2014-05-13 10:03:26 +10:00
Azaezel
a33e500b8d alters projectile decal application so that it picks a random rotAroundNormal when adding it to a scene. (keeps em from always pointing north or up) 2014-05-12 16:37:25 -05:00
Lukas Joergensen
4de9bd4e85 Initialize StockColors 
This commit makes sure the StockColors are initialized and destroyed, using
the module system.
 2014-05-12 11:01:04 +02:00
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
Daniel Buckmaster
79d896c0f4 Merge pull request #636 from LuisAntonRebollo/fix_cmake_mayor 
Fix cmake mayor
 2014-05-07 07:54:34 +10:00
LuisAntonRebollo
b8b77ef488 Rename CMake "TORQUE_APP_VERSION_MAYOR" to "TORQUE_APP_VERSION_MAJOR" 2014-05-06 17:44:12 +02: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
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
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
51aca89165 Fix ScatterSkyVertex::color declaration. 2014-04-17 13:37:23 +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
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