TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-22 04:45:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
597 commits 5 branches 33 tags 1,009 MiB
Commit graph

597 commits

This branch
This branch
All branches
Author SHA1 Message Date
Azaezel
894d4f6d36 editor default and retrieval values for particle emitter ejectionOffsetVariance (sets the sliderbars and text from memory when reloading an emitter DB) 2014-05-13 21:38:49 -05:00
Daniel Buckmaster
7a517d3cb1 Merge pull request #613 from lukaspj/T2DColors 
T2D style 'Stock colors'
 2014-05-13 10:03:26 +10: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
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
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
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
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
LuisAntonRebollo
6dfaf33d29 Merge pull request #578 from tdev/gitignore 
improved gitignore for VS2012
 2014-03-16 14:03:08 +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