Commit graph

2669 commits

Author SHA1 Message Date
Thomas "elfprince13" Dickerson
bcc5459818 whitespace 2017-01-11 23:34:46 -05: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
Areloch
2192191268 Merge pull request #1919 from elfprince13/patch-1
Fixed StaticShape onUnmount
2017-01-07 02:09:25 -06: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
Thomas "elfprince13" Dickerson
609b378369 The wrong array was being indexed, and the type checker didn't catch it because it was a variadic function 2017-01-05 20:01:52 -05:00
Thomas "elfprince13" Dickerson
cd98ee730f Matched up platform semaphore declarations 2017-01-05 20:00:33 -05:00
Thomas "elfprince13" Dickerson
233771dcdc Don't use the register keyword with modern compilers, they know better than you (and complain that it's deprecated to boot 2017-01-05 17:39:10 -05:00
Thomas "elfprince13" Dickerson
32f726dcc6 Net tests were failing to compile because 'static members' weren't actually being declared as members... 2017-01-05 13:35:07 -05:00
Thomas Dickerson
3f73bb99b9 Merge pull request #2 from GarageGames/development
Jumping into the future
2017-01-05 12:21:06 -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
Areloch
8a39f5e7b6 Merge pull request #1896 from rextimmy/physics_shapes
PhysicsShapeData examples
2017-01-04 02:23:28 -06:00
Areloch
95d2dd8bd6 Merge pull request #1898 from rextimmy/physicsShape_updates
PhysicsShape applyTorque function
2017-01-04 02:23:12 -06:00
Areloch
743bb67faf Merge pull request #1895 from John3/Unused1
Unused preDemoRecord()
2017-01-04 02:22:38 -06:00
rextimmy
18c906ca09 Physx cmake module correction 2017-01-04 17:20:43 +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
rextimmy
b23b8d118e Physx 3.3 cmake support 2017-01-04 01:47:01 +10:00
rextimmy
a3173b566e PhysicsShapeData examples 2017-01-03 10:24:47 +10:00
Anis
f42c9bd9b7 Merge pull request #1828 from John3/fix696
fix issue #696
2017-01-02 12:01:01 +01:00
Anis
d164781329 Merge pull request #1829 from irei1as/patch-1
Adding depth option to the texture of guiOffscreenCanvas
2017-01-02 11:52:36 +01:00
Anis
134ff42603 Merge pull request #1891 from rextimmy/dx11_shadermodel_fix
D3D11 shadermodel version fix
2017-01-02 11:49:51 +01:00
Johxz
731981dbb6 Unused preDemoRecord() 2017-01-01 22:17:45 -06:00
rextimmy
34e877b6e0 Added feature level version to card profiler version string for D3D11 2016-12-30 11:40:32 +10:00
rextimmy
86a95e748e Added getShaderModel string to D3D11 for use with shader version macros. 2016-12-30 11:40:00 +10:00
Areloch
38554f7396 Merge pull request #1885 from John3/updateLibVorbis135
update libvorbis 135
2016-12-29 00:51:41 -06:00
Johxz
57429aea80 del unnecessary files 2016-12-29 00:24:24 -06:00
Areloch
8098f8f9ef Merge pull request #1889 from rextimmy/bullet_285
Bullet 2.85 update
2016-12-29 00:16:16 -06:00
Areloch
46d81f5d26 Merge pull request #1886 from Azaezel/socketSigShenanigans
looks like getsockname needs a slightly different signature for crossplat support
2016-12-28 23:59:04 -06:00
Areloch
4257d14ad2 Merge pull request #1890 from John3/torqueSimViewTool
added torque SimView tool
2016-12-28 23:58:23 -06:00
Areloch
4a84c68137 Merge pull request #1882 from rextimmy/gl_vsync
OpenGL vsync fixes.
2016-12-28 21:45:12 -06:00
Johxz
260f108693 added torque SimView tool 2016-12-28 15:25:55 -06:00
rextimmy
c08f75f52a Bullet plugin update for bullet 2.85.
Fix potential crash with BtPlayer::_stepForward
2016-12-28 18:33:19 +10:00
rextimmy
540c9b72c0 Bullet 2.85 update 2016-12-28 18:32:21 +10:00
Areloch
7688042112 Merge pull request #1888 from Azaezel/updateEmpty
brings empty up to date for core and shader dirs
2016-12-27 22:15:41 -06:00
Areloch
7d60b2109e Merge pull request #1883 from rextimmy/dx11_updates
DX11 updates
2016-12-27 22:14:01 -06:00
Areloch
b19aba2e54 Merge pull request #1879 from Azaezel/sRGBSwatch
colorPicker/swatch srgb display.
2016-12-27 22:11:02 -06:00
Areloch
50c856f797 Merge pull request #1887 from Azaezel/hdrCleanups
HDR review: remove from reflections, kill depth check, order of ops
2016-12-27 22:10:41 -06:00