Commit graph

1870 commits

Author SHA1 Message Date
Areloch e724b2fcdd Merge pull request #1983 from klaus95/patch-1
Fix for bug #1738
2017-04-17 20:27:56 -05:00
Areloch 6cee446926 Merge branch 'development' into Fix_Issue_#1951_TCPObject_is_broken_3.10 2017-04-17 20:19:20 -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
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 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
Azaezel d04a432f19 profiling blocks for navmesh subsystem analysis 2017-04-05 13:04:25 -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 397ba19805 Merge branch 'development' into snapwork 2017-03-05 22:58:29 -06:00
Areloch 9c7b5eec73 Merge pull request #1949 from Areloch/getSignedAngleFunc
Adds the getSignedAngleBetweenVectors function
2017-03-05 02:08:02 -06:00
Areloch 22fdf566fe 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
Thomas "elfprince13" Dickerson d3956cb532 merged numerous changes from upstream 2017-03-03 21:17:07 -05:00
Areloch bf6add9b33 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
Azaezel f1d315d51a adds an atGizmo option - for now drops a new object at a given singular mesh position. TODO: at the center of a given group. 2017-02-26 18:34:32 -06:00
Areloch d680dc9934 Initial implementation of the new Base Game Template and some starting modules.
This makes some tweaks to the engine to support this, specifically, it tweaks the hardcoded shaderpaths to defer to a pref variable, so none of the shader paths are hardcoded.

Also tweaks how post effects read in texture files, removing a bizzare filepath interpretation choice, where if the file path didn't start with "/" it forcefully appended the script's file path. This made it impossible to have images not in the same dir as the script file defining the post effect.

This was changed and the existing template's post effects tweaked for now to just add "./" to those few paths impacted, as well as the perf vars to support the non-hardcoded shader paths in the engine.
2017-02-24 02:40:56 -06:00
Azaezel 1458494b2a applies mUseGroupCenter checks across the board 2017-02-22 15:49:26 -06:00
Azaezel ebdd441833 adds a useGroupCenter var/button to allow folks to use non-itterative snapping, and defaults it to do so (maintains prior functionality envelope) 2017-02-22 14:31:26 -06:00
Francisco Montañés García 49130dbd71 Proposed fix for Issue #1951. Checked with IP4. IP6 should work as wel but not checked yet. 2017-02-22 19:27:08 +01:00
Azaezel 7d2315c781 sets snap to grid to itterate through selected objects and settle them into the nearest (seected value), ie 1, 2.5, 3.33 ect. 2017-02-22 00:36:53 -06:00
Areloch c2c34cdd5d Adds the getSignedAngleBetweenVectors function, which is like the existing getAngleBetweenVectors, but will returned a signed angle value, which helps to inform the full 360 angle, rather than the 'nearest 180'. 2017-02-19 23:00:54 -06:00
Areloch 5c8a82180b Merge pull request #1938 from John3/add_strikeObject
added strikeObject lightning feature
2017-02-04 23:10:12 -06:00
Areloch 2db03e47e9 Fixes a crash when you try to delete things without being in selection mode in the forest editor. Adds a sanity check that everything is properly set up before attempting the delete action.
Also adds a fix to the mesh item tab in the forest editor to correct odd selection behavior that could erroneously cause selection of two items in the list when you only clicked one.
2017-02-04 22:45:49 -06:00
Johxz 84f610f2f2 fix tabs vs space, fix net strikepoints 2017-02-03 18:23:34 -06:00
Areloch 3717e3b670 Merge pull request #1937 from John3/fixLightningWarningFlashes
fix warningFlashes() of lightning class
2017-01-31 20:02:17 -06:00
Areloch 73752ff061 Hotfix to re-add the prior static function fix for these functions that was accidentally removed. 2017-01-31 19:16:34 -06:00
Johxz 3cd82d9229 add strikeObject functionality feature 2017-01-31 18:38:09 -06:00
Johxz 381169c3c2 fix warningFlashes() of lighting 2017-01-31 15:25:50 -06:00
Areloch 8f420893eb Merge branch 'development' into osxDedeprecation 2017-01-31 09:44:52 -06:00
Areloch 501b55d939 Adds a check to the record movie call so that it only happens in Release mode, to avoid crash issues with theora and debug mode. 2017-01-30 20:36:48 -06:00
Areloch 48bd911dcb Made sure the old code was still there for non-SDL usage. 2017-01-29 04:12:32 -06:00
Areloch a8f2fc567b Fixes up the handling of accelerator keybinds for SDL - specifically compound ones with several modifier keys, ie ctrl-alt-shift-up. 2017-01-29 03:22:25 -06:00
Areloch ac19e0e84c Merge pull request #1928 from lukaspj/particle-manager-lmactivate-cleanup
Cleanup when deactivating light manager instead of reinitializing
2017-01-25 21:23:36 -06:00
Areloch 7185d9664d Merge pull request #1923 from elfprince13/stringTableEmptyString
String table empty string
2017-01-25 21:06:44 -06:00
Areloch 1523fe55de Merge pull request #1931 from Areloch/LightingFix
Fixes some issues with lightning
2017-01-24 23:43:19 -06:00
Thomas Dickerson 6963d35145 Merge branch 'development' into stringTableEmptyString 2017-01-24 12:35:34 -05:00
Areloch 80a2a8c29a Fixed the fadeout coloration when using textures, as well as some cleanup for the code. 2017-01-23 18:52:30 -06:00
Areloch ec8b657b71 Adds support for multiple textures used in the strike rendering per @RichardsGameStudio's help. 2017-01-19 19:15:50 -06:00
Areloch c7b041f545 Fixes the debug netevent packing error by keeping the mStart value as it's proper 0-1 range until it gets to the client, using a temporary world-space var for finding strike target objects in the radius.
Also add a checker for if there is a texture or not set for the lighting bolt. If it use, set the stateblock description to support it and set the texture, if not, only utilize the color blend.
2017-01-16 22:11:32 -06:00
Anis 16baa4d51a Merge pull request #1929 from lukaspj/renderpasmanager-initpersistfields
Make RenderPassManager call Parent::InitPersistFields
2017-01-16 15:56:41 +01:00
Anis 0911311e98 Merge pull request #1930 from rextimmy/texture_crash
Texture crash
2017-01-16 15:55:34 +01: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
LukasPJ f50d46dffc Cleanup when deactivating light manager instead of reinitializing 2017-01-15 23:23:55 +01:00
LukasPJ 2029e3eb22 Make RenderPassManager call Parent::InitPersistFields 2017-01-15 23:22:46 +01:00