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
f43bfd6ca2
Cleans up a few cmake options and flags a most of the alsoft and sdl options as advanced so they're not cluttering up the regular view for no reason
2017-01-17 01:10:24 -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
0aea1d5c33
Merge pull request #1878 from Areloch/splashAndWindowIcons
...
Fixes window icons with SDL
2017-01-16 00:18:31 -06:00
Areloch
6a204f3528
Missed removing the old BMP splash for the new PNG one.
2017-01-16 00:16:17 -06: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
Anis
c702ba0f12
Merge pull request #1926 from elfprince13/patch-1
...
Call the correct system rename
2017-01-14 18:42:27 +01:00
Thomas "elfprince13" Dickerson
42efbd410e
Merge remote-tracking branch 'origin/patch-1'
2017-01-13 14:42:56 -05: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
Thomas "elfprince13" Dickerson
f822c943b8
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:42:52 -05:00
Thomas "elfprince13" Dickerson
ca02f8ccdb
Merge remote-tracking branch 'garagegames/development'
2017-01-13 00:54:13 -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
ec5efe5411
Replaced StringTable->insert("") with StringTable->EmptyString()
2017-01-11 23:21:29 -05:00
Thomas "elfprince13" Dickerson
93ab336fb5
Merge branch 'perProjectCmakes'
2017-01-11 18:03:48 -05:00
Thomas "elfprince13" Dickerson
f05a552c61
Optionally include a CMake configurations file from the project directory to support configuration changes that don't have to alter the whole engine repo
2017-01-11 18:03:21 -05:00
Thomas "elfprince13" Dickerson
90beb1c378
reindented
2017-01-11 17:11:37 -05:00
Thomas "elfprince13" Dickerson
81c8c3f99d
Merge branch 'development' of github.com:GarageGames/Torque3D
2017-01-11 12:04:30 -05:00
Thomas "elfprince13" Dickerson
d64e2a7019
Removed constexpr use to support VS2013
2017-01-10 23:22:05 -05:00
Thomas "elfprince13" Dickerson
2bb64a0e74
Removed constexpr use to support VS2013
2017-01-10 23:20:48 -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
65aa574d87
Merge branch 'development' of github.com:GarageGames/Torque3D
2017-01-07 16:54:00 -05:00
Areloch
2192191268
Merge pull request #1919 from elfprince13/patch-1
...
Fixed StaticShape onUnmount
2017-01-07 02:09:25 -06:00
Thomas "elfprince13" Dickerson
1c2b096a72
Whitespace consistency
2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson
d90b602e5a
whitespace updates
2017-01-06 23:04:49 -05:00
Thomas "elfprince13" Dickerson
7126b5868a
fixed a typo from upstream
2017-01-06 23:03:49 -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
Thomas "elfprince13" Dickerson
e2c61e1eb4
Merge branch 'development' of github.com:GarageGames/Torque3D
2017-01-06 22:52:04 -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
