Commit graph

3499 commits

Author SHA1 Message Date
Areloch
0637f39928 Merge pull request #1988 from DTFuchs/Redundant-Check-GetTrailingNumber
Better bug fix for #1738 (str.cpp)
2017-04-26 23:27:17 -05:00
AlexBarys
3336fa11ee Fixed misspelling of dragCoefficient property
As noted in issue #1501, the dragCoefficient property was misspelled in multiple locations as "dragCoeffiecient"
This corrects the spelling in all of those locations.
2017-04-26 13:10:32 -04:00
aaravamudan2014
878194bc9c Merge branch 'development' of https://github.com/aaravamudan2014/Torque3D into development 2017-04-26 09:41:06 -04:00
aaravamudan2014
591ddf6ae1 Added new config file save for vehicle re-mappings
Added gui functionality for vehicle re-mapping

Update optionsDlg.cs

Fixed some coding guidelines problem

Fix some of the indentation problems (tabs replaced by spaces).
Curly bracket guidelines followed.

fixed some indentation problems

just noticed a few more indentation problem, my bad.
2017-04-26 09:40:38 -04:00
Areloch
eded563ec2 Merge pull request #1991 from AlexBarys/AITurretIgnoreListFunctions
Ai turret ignore list functions
2017-04-26 01:21:56 -05:00
Areloch
19dcfde60f Merge pull request #1984 from FooBarbarians/fix-1912
Reordering initialization methods #1912
2017-04-26 01:11:51 -05:00
Areloch
ab51befa68 Merge pull request #1979 from Azaezel/purdyPitureProfiler
adds profiling to the various gbitmap loaders*
2017-04-26 01:01:54 -05:00
AlexBarys
21ea3f5ba2 Fixed old names of decal properties
Renamed the screenStartRadius and screenEndRadius properties in the bulletHoleDecal datablock and ScorchRXDecal datablock to fadeStartPixelSize and fadeEndPixelSize properties, respectively, to match names of the properties as defined in the decalData.cpp file, as noted in issue #1498
Among other possible fixes, this makes the size of the bullet hole decal's actually random in size now, instead of always being the exact same size.
2017-04-23 19:06:36 -04:00
AlexBarys
b82e87ec89 Function definitions for new functions
Added header file definitions for the two new functions created to implement the features requested in issue #1272
2017-04-23 19:01:31 -04:00
AlexBarys
1cddf09590 Implementation for two new features
Added implementation to expose two new functionalities from the c++ to Torquescript as requested in issue #1272.  Added both a DefineEngineMethod function for getting the count of the number of objects on the turret ignore list and a DefineEngineMethod function for returning a reference to the object on the ignore list at a given index on the ignore list.  Also added functions that do each of those things and are then encapsulated by those DefineEngineMethod functions.
2017-04-23 18:58:40 -04:00
AlexBarys
591f0088e0 Added clearIgnoreList() definition
Added the definition for the new function created to implement the feature request in issue #1271 to clear the entire ai turret ignore list with one function call.
2017-04-23 18:49:26 -04:00
DTFuchs
3121f30743 Update str.cpp 2017-04-23 18:49:08 -04:00
AlexBarys
afaf3648b4 Implementation to clear entire turret ignore list
Implementing the feature request made in issue #1271 to expose the functionality to clear the entire ai turret ignore list to Torquescript.
2017-04-23 18:46:17 -04:00
aaravamudan2014
55c12ebad9 fixed some indentation problems
just noticed a few more indentation problem, my bad.
2017-04-20 14:11:41 -07:00
aaravamudan2014
3ea47a5806 Fixed some coding guidelines problem
Fix some of the indentation problems (tabs replaced by spaces).
Curly bracket guidelines followed.
2017-04-20 09:21:39 -04:00
aaravamudan2014
a9833419bc Update optionsDlg.cs 2017-04-20 08:48:43 -04:00
Masquara
970dd5c477 Reordering initialization methods #1912 2017-04-19 14:02:45 -04:00
Areloch
ea3eb65efd Merge pull request #1977 from Areloch/Xenon_Removal
Removes bits of code and includes that are based on old console flags
2017-04-18 20:48:35 -05:00
Areloch
c443e7a4ae Merge branch 'development' into Xenon_Removal 2017-04-18 20:47:43 -05:00
Areloch
67aa2e0f4d Merge pull request #1980 from Areloch/PrepassToDeferredRename
Replaces uses of 'Prepass' with 'Deferred'
2017-04-18 20:46:21 -05:00
Areloch
e724b2fcdd Merge pull request #1983 from klaus95/patch-1
Fix for bug #1738
2017-04-17 20:27:56 -05:00
Areloch
130d08edd4 Merge pull request #1952 from pacomont/Fix_Issue_#1951_TCPObject_is_broken_3.10
Fix issue #1951 tcp object is broken 3.10
2017-04-17 20:19:39 -05:00
Areloch
6cee446926 Merge branch 'development' into Fix_Issue_#1951_TCPObject_is_broken_3.10 2017-04-17 20:19:20 -05:00
Areloch
3b17e25a4c Merge pull request #1981 from killsap/development
Possible fix to issue #1951
2017-04-17 20:07:06 -05:00
klaus95
5378abfc55 Fix for bug #1738
getTrailingNumber("string") and stripTrailingNumber("string") will now work for single letter cases. For example, getTrailingNumber() will return "11" if the input is "a11" or "t11", and stripTrailingNumber() will return "a" if the input is "a11".
2017-04-17 15:46:44 -07:00
aaravamudan2014
dfd5812e07 Added gui functionality for vehicle re-mapping 2017-04-17 16:11:10 -04:00
aaravamudan2014
92b169337e Added new config file save for vehicle re-mappings 2017-04-17 16:07:03 -04:00
Chris Millsap
55f3430571 Comment formatting
Removed incorrect comments to be more inline with windows and linux. Put
comment on line 812 on top of code.
2017-04-12 18:54:59 -04:00
Chris Millsap
db3ffab832 Possible fix to issue #1951
(Code formated to be submitted for pull request) -- Indentation was off.
SAME FIX AS BEFORE

When two instances of Torque3D are running on the same network, one as a
hosted server and the other as a client, the client is unable to connect
to the server. The program now can open a socket. This was obviously a
typo. To find the error I just searched for keywords containing socket,
open, open socket, and opensocket till I found the correct file. The
other error was in how the program processed “non fatal” errors. I just
outputed the error to the main console and devised that the socket
should not be closed for a WSAEWOULDBLOCK error 10035 "It is normal for
WSAEWOULDBLOCK to be reported as the result from calling connect on a
nonblocking SOCK_STREAM socket, since some time must elapse for the
connection to be established."

Read about the WouldBlock error:

https://msdn.microsoft.com/en-us/library/windows/desktop/ms740668(v=vs.85).aspx

Use of dbgSetParameters ( port , password ):

http://docs.garagegames.com/tge/official/content/documentation/Reference/Console%20Functions/TorqueScript_Console_Functions_2.html#dbgSetParameters_.28_port_.2C_password_.29
2017-04-11 14:51:29 -04:00
Areloch
1bfdb41694 Goes and replaces the references/names that use Prepass to be Deferred, since we're actually using deferred. 2017-04-11 00:23:14 -05:00
Azaezel
f889aebcea adds profiling to the various gbitmap loaders*
*note, DDS bypasses the gbitmap method chain in question.
2017-04-10 21:43:38 -05:00
Areloch
87283640b7 Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag 2017-04-09 23:26:35 -05:00
Areloch
7f735cae2e Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif 2017-04-08 21:06:47 -05:00
Areloch
26fd24fbab Removes bits of code and includes that are based on old 360, xbox and PS3 flags that are no longer needed. 2017-04-08 20:30:57 -05:00
Areloch
513789c2c7 Merge pull request #1961 from Azaezel/snapwork
[augs]Snapwork
2017-04-08 17:40:46 -05:00
Areloch
4117871bf6 Merge pull request #1963 from elfprince13/exitingTypoFix
Exiting typo fix
2017-04-08 17:31:49 -05:00
Areloch
e3b442b50c Merge pull request #1973 from Azaezel/endingEmpty
empty template is superceded by basegame + plugins.
2017-04-08 17:27:46 -05:00
Areloch
229132652e Merge pull request #1974 from Azaezel/navmeshProfiling
profiling blocks for navmesh subsystem analysis
2017-04-08 17:23:33 -05:00
Areloch
ea4115fedc Merge pull request #1968 from Areloch/FillInBaseGame
Fill in base game
2017-04-08 16:17:29 -05:00
Azaezel
d04a432f19 profiling blocks for navmesh subsystem analysis 2017-04-05 13:04:25 -05:00
Azaezel
f8f56a7b5e empty template is superceded by basegame + plugins. 2017-04-05 09:28:57 -05:00
Areloch
4d6938d0ca Merge pull request #1970 from Azaezel/soSquishy
squish update (primarily to add additional formats for later usage)
2017-04-05 09:19:30 -05:00
Francisco Montañés García
c32ceec27f Initialice rot.y. 2017-04-05 13:08:34 +02:00
Azaezel
ac37547d4f squish update (primarily to add additional formats for later usage) 2017-03-30 20:44:35 -05:00
Areloch
c74242309a Additional cleanup and add-in of files that were missed. 2017-03-27 00:36:23 -05:00
Areloch
ea595143e8 Re-adds some bits from the old templates that were missed when doing the BaseGame template. 2017-03-26 17:53:01 -05:00
Thomas "elfprince13" Dickerson
eaddbd9759 typo fix 2017-03-10 20:01:56 -05:00
Thomas "elfprince13" Dickerson
f7ce30f42c Merge branch 'development' of github.com:GarageGames/Torque3D 2017-03-07 20:08:17 -05:00
Azaezel
e5a1e6a2a6 basegame script update for snapwork 2017-03-05 23:07:02 -06:00
Azaezel
397ba19805 Merge branch 'development' into snapwork 2017-03-05 22:58:29 -06:00