aaravamudan2014
b845cec2c4
fixed some indentation problems
...
just noticed a few more indentation problem, my bad.
2017-04-20 14:11:41 -07:00
aaravamudan2014
18303f1145
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
ae0fd3d616
Update optionsDlg.cs
2017-04-20 08:48:43 -04:00
Masquara
15f67015d3
Reordering initialization methods #1912
2017-04-19 14:02:45 -04:00
Areloch
974f257f67
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
dba8b5b327
Merge branch 'development' into Xenon_Removal
2017-04-18 20:47:43 -05:00
Areloch
464a113c6a
Merge pull request #1980 from Areloch/PrepassToDeferredRename
...
Replaces uses of 'Prepass' with 'Deferred'
2017-04-18 20:46:21 -05:00
Areloch
6423ab50b1
Merge pull request #1983 from klaus95/patch-1
...
Fix for bug #1738
2017-04-17 20:27:56 -05:00
Areloch
6c586c8356
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
5be2497b69
Merge branch 'development' into Fix_Issue_#1951_TCPObject_is_broken_3.10
2017-04-17 20:19:20 -05:00
Areloch
74a5ad6279
Merge pull request #1981 from killsap/development
...
Possible fix to issue #1951
2017-04-17 20:07:06 -05:00
klaus95
d6fd1a49ca
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
e6788ca714
Added gui functionality for vehicle re-mapping
2017-04-17 16:11:10 -04:00
aaravamudan2014
eb849853ce
Added new config file save for vehicle re-mappings
2017-04-17 16:07:03 -04:00
Chris Millsap
f421a50e5a
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
c0906e1c41
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
af8fbf0e3a
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
66c7173fda
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
214aae7277
Removed the unneeded PPC And Altivec elements, and removed the LOCBUILD flag
2017-04-09 23:26:35 -05:00
Areloch
bf229a9c0b
Missed a bit. Readded an accidental removal, and cleaned up an extraneous endif
2017-04-08 21:06:47 -05:00
Areloch
ed14b6fced
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
b052a1f970
Merge pull request #1961 from Azaezel/snapwork
...
[augs]Snapwork
2017-04-08 17:40:46 -05:00
Areloch
1867ae26c1
Merge pull request #1963 from elfprince13/exitingTypoFix
...
Exiting typo fix
2017-04-08 17:31:49 -05:00
Areloch
a61289e71c
Merge pull request #1973 from Azaezel/endingEmpty
...
empty template is superceded by basegame + plugins.
2017-04-08 17:27:46 -05:00
Areloch
f0edbf7f95
Merge pull request #1974 from Azaezel/navmeshProfiling
...
profiling blocks for navmesh subsystem analysis
2017-04-08 17:23:33 -05:00
Areloch
6d269f2960
Merge pull request #1968 from Areloch/FillInBaseGame
...
Fill in base game
2017-04-08 16:17:29 -05:00
Azaezel
83aa47da1a
profiling blocks for navmesh subsystem analysis
2017-04-05 13:04:25 -05:00
Azaezel
2d5daea554
empty template is superceded by basegame + plugins.
2017-04-05 09:28:57 -05:00
Areloch
f7c852c884
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
fba9580004
squish update (primarily to add additional formats for later usage)
2017-03-30 20:44:35 -05:00
Areloch
7e5d2f3eac
Additional cleanup and add-in of files that were missed.
2017-03-27 00:36:23 -05:00
Areloch
b357ad077d
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
f0996f8c84
typo fix
2017-03-10 20:01:56 -05:00
Thomas "elfprince13" Dickerson
9fbea728d7
Merge branch 'development' of github.com:GarageGames/Torque3D
2017-03-07 20:08:17 -05:00
Azaezel
3f94a33a5f
basegame script update for snapwork
2017-03-05 23:07:02 -06:00
Azaezel
f8a81d2634
Merge branch 'development' into snapwork
2017-03-05 22:58:29 -06:00
Areloch
9083682d40
Merge pull request #1949 from Areloch/getSignedAngleFunc
...
Adds the getSignedAngleBetweenVectors function
2017-03-05 02:08:02 -06:00
Areloch
d3ec45d825
Merge pull request #1959 from Areloch/SDLSplashScreenCleanupSanity
...
Does better sanity checking on cleanup for the splash screen closing in SDL
2017-03-05 02:06:22 -06:00
Areloch
1adab71cf1
Merge pull request #1953 from Areloch/NewBaseGameTemplateFinal
...
Initial implementation of the new Base Game Template
2017-03-05 02:05:39 -06:00
Areloch
d793bb6804
Added the data/shaderCache dir for procedural shader files to generate into as well.
2017-03-05 01:26:33 -06:00
Areloch
9bf9184628
Fixed up the GL side, and tweaked some shader pathing to not cause issues with the new common shader placement.
2017-03-05 01:19:21 -06:00
Thomas "elfprince13" Dickerson
849a1c1eb1
merged numerous changes from upstream
2017-03-03 21:17:07 -05:00
Areloch
336020c102
Adds the ability for modules to flag if they override existing objects during their creation.
2017-03-02 00:18:24 -06:00
Areloch
c91c900e19
Does better sanity checking on cleanup for the splash screen closing with SDL. Could erroneously get called a second time and if we'd already cleared the images and textures, it could crash.
...
This fixes that.
2017-03-02 00:02:28 -06:00
Areloch
2f88bdf865
Tweaked the no-levels-found popup messagebox to properly call the returnTo functionality to bump back to the appropriate originator gui.
2017-03-01 00:46:39 -06:00
Areloch
bd3af15260
Missed adding the postFXInit call to the main.cs.in file.
2017-02-27 23:02:33 -06:00
Areloch
9379fd79c5
Merge branch 'NewBaseGameTemplateFinal' of https://github.com/Areloch/Torque3D into NewBaseGameTemplateFinal
2017-02-27 22:48:02 -06:00
Areloch
9f171a42e7
Adds some basic, common materials to the editor so some starting point is always on-hand, as well as hook the BlankRoom starting editor level up to use them.
...
Added a check so if no levels are found from other modules, the default ui module will prompt the user to launch the editor to the base editor level and begin editing or return to main menu if tools are present, or inform them to double-check that there are modules with gameplay/levels and return them to the main menu in no tools available.
Also set it up so if the editor is launched while a mission isn't running, it'll automatically load to the base editor level and set up a default camera object. This way editing can be done even if no level is currently loaded.
2017-02-27 22:46:17 -06:00
Areloch
1788bee4f6
Corrects an issue where a change to the target template may not generate the appropriate main.cs for that template after the initial build configure.
2017-02-27 17:10:08 -06:00
