Commit graph

2694 commits

Author SHA1 Message Date
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
Anis c702ba0f12 Merge pull request #1926 from elfprince13/patch-1
Call the correct system rename
2017-01-14 18:42:27 +01:00
Thomas Dickerson 512514df20 Call the correct system rename
Addressing #1913
2017-01-13 14:40:10 -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 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
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 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 1048b7d535 finished variadic conversion 2017-01-06 17:19:43 -05:00
Thomas "elfprince13" Dickerson 39bea37fa0 minor fixes, and converted the type table 2017-01-06 17:19:36 -05:00
Thomas "elfprince13" Dickerson 500383591c TSShapeConstruct commands converted 2017-01-06 17:19:27 -05:00
Thomas "elfprince13" Dickerson b215bfb933 executef converted 2017-01-06 17:19:16 -05:00
Thomas "elfprince13" Dickerson 62e3fae060 so many variadics. 2017-01-06 17:19:08 -05:00
Thomas "elfprince13" Dickerson 0dfb15dc57 Another set of templates converted to be variadic 2017-01-06 17:18:47 -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 733fd3ef6d Fixed up the passing of the tuple types 2017-01-06 17:18:18 -05:00
Thomas "elfprince13" Dickerson 35cc16d22c slightly better organization, but same compiling problem 2017-01-06 17:18:06 -05:00
Thomas "elfprince13" Dickerson 26da831b01 This commit is broken, but has a lot of important stuff in it. Trying to figure out why my constructor thinks it doesn't take any parameters 2017-01-06 17:17:45 -05:00
Thomas "elfprince13" Dickerson 5a53fe7311 Started variadic templates in engine API 2017-01-06 17:17:24 -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