Commit graph

225 commits

Author SHA1 Message Date
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 713c93d328 Merge branch 'splashAndWindowIcons' of https://github.com/Areloch/Torque3D into development 2017-01-15 23:37:06 -06: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 d64e2a7019 Removed constexpr use to support VS2013 2017-01-10 23:22:05 -05:00
Thomas "elfprince13" Dickerson 1c2b096a72 Whitespace consistency 2017-01-06 23:10:14 -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 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
Areloch 170cdadf60 Fixes window icons with SDL, hooking it through the var $Core::windowIcon as the path.
Also adjusted the splash window icon to use the var $Core::splashWindowImage for it's path.
2016-12-22 00:52:34 -06:00
Areloch a3740719b1 Merge pull request #1817 from jamesu/ipv6_pr
Preliminary IPV6 Support
2016-12-04 16:22:42 -06:00
Areloch cf065ed536 Merge pull request #1585 from Areloch/execToCon
Make exec() and getDSOPath() proper Con namespace functions.
2016-11-26 02:04:38 -06:00
James Urquhart 704577e051 Preliminary IPV6 Support 2016-10-25 19:09:02 +01:00
Anis 60e258e5a9 Merge pull request #1806 from Azaezel/byeByeVarVar2
more unused variable cleanups
2016-10-23 21:04:36 +02:00
Areloch 6cc7bcd2e0 Merge pull request #1805 from Azaezel/startRightEndRight
clang: constructor initialization order
2016-10-19 08:39:12 -05:00
Areloch d8644e0426 Merge pull request #1813 from Azaezel/loopyLines
clang catch: garbage in line directives
2016-10-19 00:10:09 -05:00
Azaezel 4bc1491714 clang catch: garbage in line directives 2016-10-18 11:37:18 -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
Azaezel 1ee127b753 more unused variable cleanups 2016-10-16 14:41:34 -05:00
Azaezel fbfd3ed8ed clang: constructor initialization order
while not a major issue per-se, the sheer number of times the engine has to jump back in memory and backfill data in a given class can add up. First run of... many.,
2016-10-14 18:16:55 -05:00
RexTimmy dd64004eaf MacOS platform support. 2016-09-28 11:09:48 +10:00
Areloch 810ac82eae Adds a missed cleanup for currentNewObj. 2016-06-20 12:34:07 -05:00
Areloch 3cfc6f787c Adds some pointer cleanup in the event we bail out of creating a new object for whatever reason. 2016-06-11 02:06:24 -05:00
Areloch fa78a2f354 Adds Component, the various main component classes and their interfaces. 2016-05-14 00:00:02 -05:00
Areloch 9bc87709ab Merge branch 'RotationFPR_Cleaned' of https://github.com/Areloch/Torque3D into development 2016-05-12 23:35:21 -05:00
Areloch 383d27f2ec The class is designed as a general-purpose rotation/orientation class to make it easy to work with rotations and swap between math types as easily as possible. 2016-05-12 00:45:16 -05:00
Areloch b3bc199975 Adds a TypeSimObjectPtr type for easy reference to other objects as a field. 2016-04-30 23:38:35 -05:00
Areloch 86dd8a8cf7 Adds a onPostAdd callback to simObject so we can do handling AFTER the object and it's children have been added successfully. 2016-04-30 23:32:10 -05:00
Areloch 255fec1a9d Make exec() and getDSOPath() proper Con namespace functions.
Moves the console function exec()'s body into an actual function in the Con namespace as the function executeFile() to align with the other execute and eval functions.
Also moved the getDSOPath function(as exec/executeFile requires it) from being local in consoleFunctions.cpp to a Con namespace function as well, furthering the consistency.
2016-04-19 01:35:52 -05:00
Alex Piola 07cf85143b fixes crash when callOnChildren
Anis and me managed to fix this: #1508
2016-03-04 18:03:21 +01:00
Anis A. Hireche 49443d3167 conflict resolution 2016-02-27 02:16:07 +01:00
Anis A. Hireche b3662d801a Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1334
# Conflicts resolved:
#	Engine/source/console/consoleFunctions.cpp
2016-02-26 21:58:01 +01:00
Anis 973e5a6c02 Update consoleFunctions.cpp 2016-02-26 20:11:27 +01:00
Anis 794f1b9536 Merge pull request #1532 from GarageGames/pr/1143
[CLONE] More consolefunctions #1143
2016-02-26 18:57:49 +01:00
Anis A. Hireche 10cb6ab9c4 Merge remote-tracking branch 'refs/remotes/origin/development' into pr/1153 2016-02-26 14:39:38 +01:00
Azaezel 7a60056365 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 16:07:51 -06:00
Anis 8ec2e534dc removed tabs 2016-02-21 22:36:27 +01:00
Azaezel bc433e7c30 Merge branch 'ColorPickerAdvanced' of https://github.com/Azaezel/Torque3D into ColorPickerAdvanced 2016-02-21 15:31:09 -06:00
Azaezel ca2ffea6cd Merge branch 'development' of https://github.com/GarageGames/Torque3D into ColorPickerAdvanced 2016-02-21 15:30:54 -06:00
Anis 494922d9ed fixed the not working text edit RGB field on color picker. 2016-02-21 18:14:41 +01:00