TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2742 commits 5 branches 33 tags 958 MiB
Commit graph

1887 commits

Author SHA1 Message Date
Areloch 5c8a82180b Merge pull request #1938 from John3/add_strikeObject 
added strikeObject lightning feature
 2017-02-04 23:10:12 -06:00
Areloch 2db03e47e9 Fixes a crash when you try to delete things without being in selection mode in the forest editor. Adds a sanity check that everything is properly set up before attempting the delete action. 
Also adds a fix to the mesh item tab in the forest editor to correct odd selection behavior that could erroneously cause selection of two items in the list when you only clicked one.
 2017-02-04 22:45:49 -06:00
Johxz 84f610f2f2 fix tabs vs space, fix net strikepoints 2017-02-03 18:23:34 -06:00
Areloch 3717e3b670 Merge pull request #1937 from John3/fixLightningWarningFlashes 
fix warningFlashes() of lightning class
 2017-01-31 20:02:17 -06:00
Areloch 73752ff061 Hotfix to re-add the prior static function fix for these functions that was accidentally removed. 2017-01-31 19:16:34 -06:00
Johxz 3cd82d9229 add strikeObject functionality feature 2017-01-31 18:38:09 -06:00
Johxz 381169c3c2 fix warningFlashes() of lighting 2017-01-31 15:25:50 -06:00
Areloch 8f420893eb Merge branch 'development' into osxDedeprecation 2017-01-31 09:44:52 -06:00
Areloch 501b55d939 Adds a check to the record movie call so that it only happens in Release mode, to avoid crash issues with theora and debug mode. 2017-01-30 20:36:48 -06:00
Areloch 48bd911dcb Made sure the old code was still there for non-SDL usage. 2017-01-29 04:12:32 -06:00
Areloch a8f2fc567b Fixes up the handling of accelerator keybinds for SDL - specifically compound ones with several modifier keys, ie ctrl-alt-shift-up. 2017-01-29 03:22:25 -06:00
Areloch ac19e0e84c Merge pull request #1928 from lukaspj/particle-manager-lmactivate-cleanup 
Cleanup when deactivating light manager instead of reinitializing
 2017-01-25 21:23:36 -06:00
Areloch 7185d9664d Merge pull request #1923 from elfprince13/stringTableEmptyString 
String table empty string
 2017-01-25 21:06:44 -06:00
Areloch 1523fe55de Merge pull request #1931 from Areloch/LightingFix 
Fixes some issues with lightning
 2017-01-24 23:43:19 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 80a2a8c29a Fixed the fadeout coloration when using textures, as well as some cleanup for the code. 2017-01-23 18:52:30 -06:00
Areloch ec8b657b71 Adds support for multiple textures used in the strike rendering per @RichardsGameStudio's help. 2017-01-19 19:15:50 -06:00
Areloch 18f77a240d Merge pull request #1925 from elfprince13/sdlUpdateFix 
Sdl update fix
 2017-01-17 21:13:52 -06:00
Areloch c7b041f545 Fixes the debug netevent packing error by keeping the mStart value as it's proper 0-1 range until it gets to the client, using a temporary world-space var for finding strike target objects in the radius. 
Also add a checker for if there is a texture or not set for the lighting bolt. If it use, set the stateblock description to support it and set the texture, if not, only utilize the color blend.
 2017-01-16 22:11:32 -06:00
Anis 16baa4d51a Merge pull request #1929 from lukaspj/renderpasmanager-initpersistfields 
Make RenderPassManager call Parent::InitPersistFields
 2017-01-16 15:56:41 +01:00
Anis 0911311e98 Merge pull request #1930 from rextimmy/texture_crash 
Texture crash
 2017-01-16 15:55:34 +01:00
Areloch f02d0d6c4e Hooks the splash window code up to the same image loading code as the icon code, and also adds a check if it tries to load a BMP for either(this is a bad format and really shouldn't be used for pretty much anything). 
Also includes a icon for the templates.
 2017-01-16 00:09:55 -06:00
Areloch 713c93d328 Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development 2017-01-15 23:37:06 -06:00
rextimmy f6d624be8f Fix mipmap count and potential crash for non square textures that are allocated with GBitmap class 2017-01-16 15:36:52 +10:00
rextimmy 11532e10cc Add log2 function to mMathFn.h 2017-01-16 15:35:25 +10:00
Areloch 598756f134 Merge pull request #1921 from Azaezel/lostLast 
address #1914
 2017-01-15 23:35:08 -06:00
LukasPJ f50d46dffc Cleanup when deactivating light manager instead of reinitializing 2017-01-15 23:23:55 +01:00
LukasPJ 2029e3eb22 Make RenderPassManager call Parent::InitPersistFields 2017-01-15 23:22:46 +01:00
Thomas Dickerson 512514df20 Call the correct system rename 
Addressing #1913
 2017-01-13 14:40:10 -05:00
Thomas "elfprince13" Dickerson cf56764347 didn't mean to include this for everyone 2017-01-13 10:45:52 -05:00
Thomas "elfprince13" Dickerson de53ac86c7 Somebody broke SDL when they updated it. The new version depends on AudioToolbox, so added that as dependency in torque3d.cmake 2017-01-13 10:44:05 -05:00
Areloch 0c6174b045 Merge pull request #1920 from elfprince13/variadicConsoleTemplates 
Variadic console templates
 2017-01-12 23:32:03 -06:00
Thomas "elfprince13" Dickerson 27e2871b01 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:36:04 -05:00
Thomas "elfprince13" Dickerson bcc5459818 whitespace 2017-01-11 23:34:46 -05:00
Thomas "elfprince13" Dickerson d64e2a7019 Removed constexpr use to support VS2013 2017-01-10 23:22:05 -05:00
Azaezel bfa2b5e963 adress #1914 2017-01-10 08:02:08 -06:00
Areloch 6164f36c47 Merge pull request #1784 from yourarcade/guiSpeedometerHud 
Gui speedometer hud
 2017-01-09 23:51:04 -06:00
Areloch 03c2ce46c2 Merge pull request #1820 from Areloch/sdl205 
Updates SDL to 2.0.5
 2017-01-09 23:38:59 -06:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas Dickerson f55fc7f336 Fixed StaticShape onUnmount 
Somebody made a typo and didn't test if it compiled before committing...
 2017-01-06 22:57:08 -05:00
Anis 55b7a8431c Merge pull request #1800 from Azaezel/andOrMaybe 
clang reports: unclear || + && and &+| mixes.
 2017-01-07 02:31:05 +01:00
Anis 2098582a76 Merge pull request #1908 from elfprince13/CMDscanRegisterUseDeprecated 
Removed deprecated use of register keyword from the TorqueScript lexer/parser
 2017-01-07 02:19:26 +01:00
Anis 5344d89a6f Merge pull request #1904 from elfprince13/fixNetTests 
Fix net tests
 2017-01-07 02:18:27 +01:00
Anis 1c9bc20899 Merge pull request #1915 from elfprince13/fixedSemaphoreStructToClass 
Fixed semaphore struct to class
 2017-01-07 02:16:12 +01:00
Anis a9ed57d436 Merge pull request #1916 from elfprince13/sfxVarianceOverFlow 
SFX Variance Overflow
 2017-01-07 02:14:04 +01:00
Areloch ca2d2651b8 Merge pull request #1901 from rextimmy/physics_timing 
Physics timing
 2017-01-06 18:52:41 -06:00
Areloch aa121c50b7 Merge pull request #1903 from rextimmy/physics_applyforce 
PhysicsShape applyForce function
 2017-01-06 18:51:42 -06:00
Areloch bedf2488a7 Merge pull request #1899 from rextimmy/physx28_removal 
Physx 2.8 removal
 2017-01-06 18:50:37 -06:00
Areloch 83d4493f53 Merge pull request #1897 from rextimmy/physx3_3 
Physx3.3 updates
 2017-01-06 18:50:16 -06:00
Thomas "elfprince13" Dickerson 9773f18a88 tabs to spaces 2017-01-06 18:06:36 -05:00