Commit graph

2019 commits

Author SHA1 Message Date
Thomas Dickerson
512514df20 Call the correct system rename
Addressing #1913
2017-01-13 14:40:10 -05:00
Thomas "elfprince13" Dickerson
cac5159717 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
07c925bd78 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
332c06ae82 Replaced StringTable->insert("") with StringTable->EmptyString() 2017-01-11 23:21:29 -05:00
Thomas "elfprince13" Dickerson
ad4a5e5a88 reindented 2017-01-11 17:11:37 -05:00
Thomas "elfprince13" Dickerson
4eff979c54 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
6bbb05e60e 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
Thomas "elfprince13" Dickerson
1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -05:00
Thomas "elfprince13" Dickerson
ce51070fc4 whitespace updates 2017-01-06 23:04:49 -05:00
Thomas "elfprince13" Dickerson
dc73228ccf 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
eed9c1c511 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
Areloch
83d4493f53 Merge pull request #1897 from rextimmy/physx3_3
Physx3.3 updates
2017-01-06 18:50:16 -06:00
Thomas "elfprince13" Dickerson
a7cb22b877 something went squiffy in the last set of merges 2017-01-06 18:41:47 -05:00
Thomas "elfprince13" Dickerson
878fbdb609 merged into master 2017-01-06 18:27:56 -05:00
Thomas "elfprince13" Dickerson
9773f18a88 tabs to spaces 2017-01-06 18:06:36 -05:00
Thomas "elfprince13" Dickerson
45ae5e71cb fixed lots of tabs and space 2017-01-06 18:04:28 -05:00
Thomas "elfprince13" Dickerson
6a1048596e but now it works 2017-01-06 17:55:59 -05:00
Thomas "elfprince13" Dickerson
a4c51b825c this is getting old 2017-01-06 17:55:44 -05:00
Thomas "elfprince13" Dickerson
76e02b41f7 one more go-round 2017-01-06 17:54:37 -05:00
Thomas "elfprince13" Dickerson
0adab54678 one more go-round 2017-01-06 17:54:19 -05:00
Thomas "elfprince13" Dickerson
e554fc7f93 undo spurious changes used to trigger dirty for tabs and spaces 2017-01-06 17:45:38 -05:00
Thomas "elfprince13" Dickerson
9c69cd32e8 Attempting to fix tabs and space (again) 2017-01-06 17:45:09 -05:00
Thomas "elfprince13" Dickerson
b31e0ad2da Attempting to fix tabs and space 2017-01-06 17:36:29 -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
60b3ce3d6e finished variadic conversion 2017-01-06 16:48:26 -05:00