Thomas "elfprince13" Dickerson
d3956cb532
merged numerous changes from upstream
2017-03-03 21:17:07 -05:00
Areloch
5c8a82180b
Merge pull request #1938 from John3/add_strikeObject
...
added strikeObject lightning feature
2017-02-04 23:10:12 -06:00
Johxz
84f610f2f2
fix tabs vs space, fix net strikepoints
2017-02-03 18:23: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
7185d9664d
Merge pull request #1923 from elfprince13/stringTableEmptyString
...
String table empty string
2017-01-25 21:06:44 -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
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
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
ec5efe5411
Replaced StringTable->insert("") with StringTable->EmptyString()
2017-01-11 23:21:29 -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
Areloch
6164f36c47
Merge pull request #1784 from yourarcade/guiSpeedometerHud
...
Gui speedometer hud
2017-01-09 23:51:04 -06: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
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
bb38a40bcb
fixed lots of tabs and space
2017-01-06 18:04:28 -05:00
Thomas "elfprince13" Dickerson
88106f9032
Fixed type inference for nulls in console functions
2017-01-06 17:18:37 -05:00
Thomas "elfprince13" Dickerson
3f6c269f6a
Fixed type inference for nulls in console functions
2017-01-06 14:50:41 -05:00
rextimmy
1559e7a3d3
PhysicsShape applyForce function
2017-01-05 10:38:05 +10:00
rextimmy
714362fc60
Physics timing
2017-01-04 19:40:22 +10:00
rextimmy
215ae090b4
Physx 2.8 removal
2017-01-04 13:34:33 +10:00
rextimmy
55e9af9786
PhysicsShape applyTorque function
2017-01-04 13:23:36 +10:00
rextimmy
e896ce0e4e
Cache PxRenderBuffer
2017-01-04 01:47:43 +10:00
Anis
f42c9bd9b7
Merge pull request #1828 from John3/fix696
...
fix issue #696
2017-01-02 12:01:01 +01:00
rextimmy
c08f75f52a
Bullet plugin update for bullet 2.85.
...
Fix potential crash with BtPlayer::_stepForward
2016-12-28 18:33:19 +10:00
Azaezel
dd071484da
Merge branch 'development' of https://github.com/GarageGames/Torque3D into andOrMaybe
...
Conflicts:
Engine/source/T3D/staticShape.cpp
2016-12-20 22:50:28 -06:00
Areloch
e00bd847fd
Fixes Bullet not supporting holes in terrain.
2016-12-20 00:05:30 -06:00
Areloch
1d754cbbad
Makes it so prefabs can correctly 'export to collada' by running the buildPolyList function on it's children.
...
Also adds a 'Bake Selection to Mesh' option to the tools menu in the editor to export the selected mesh to a collada file, and then replaces the selection with a TSStatic.
2016-12-10 17:27:27 -06:00
Johxz
69ecdc67fb
fix issue #696
2016-11-12 08:30:30 -06:00
Areloch
4c457b7f94
Hides the light's dynamic refresh rate field to avoid confusion, leaving only the static refresh rate field to be edited.
2016-11-09 23:46:34 -06:00
Areloch
00a4a21e3f
Merge pull request #1790 from blackwc/guihealthbarhud-flip
...
GuitHealthBarHud flip fill
2016-11-02 22:28:21 -05:00
Areloch
269b195355
Merge pull request #1804 from Azaezel/greatestZero
...
clang: unsigned>0 checks
2016-10-24 01:27:14 -05:00
Areloch
e8aff85322
Merge pull request #1808 from Azaezel/consistentCallbacks1
...
clang: consistent callbacks
2016-10-24 01:25:09 -05:00
Anis
60e258e5a9
Merge pull request #1806 from Azaezel/byeByeVarVar2
...
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Areloch
33f4ead242
Merge pull request #1803 from Azaezel/chasingElsey
...
clang: trailing else
2016-10-21 01:42:14 -05:00
Areloch
6cc7bcd2e0
Merge pull request #1805 from Azaezel/startRightEndRight
...
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Azaezel
5e1b6cbc48
clang: trailing else
2016-10-18 08:58:15 -05:00
Areloch
5349bad5ca
Merge pull request #1809 from dud3/patch-1
...
refactor: spacing on function call parameters
2016-10-17 23:52:08 -05:00
Areloch
121d65215e
Tweaks any enums that use uint_max values so that they have hard types to avoid any compiler kerfluffles with C++11 value narrowing, specifically pertaining to clang.
2016-10-17 01:00:12 -05:00
