Commit graph

54 commits

Author SHA1 Message Date
Anis 794f1b9536 Merge pull request #1532 from GarageGames/pr/1143
[CLONE] More consolefunctions #1143
2016-02-26 18:57:49 +01:00
Anis 8c50cc70c3 Merge pull request #1186 from MusicMonkey5555/tcp-additions
Tcp additions
2016-02-25 16:28:34 +01:00
Areloch 7a3b40a86d Initial Implementation of the Taml, Asset and Modules systems.
Only has example and shape assets currently.
2015-10-13 15:19:36 -05:00
Areloch 0d6768d57b Removing stuff pertaining to demo modes and trials, as they're redundant now. 2015-07-01 23:36:56 -05:00
Daniel Buckmaster 6c92ab065e Merge remote-tracking branch 'jamesu/console_stack_fix2' into development
Conflicts:
	Engine/source/console/console.cpp
2015-03-01 20:33:29 +11:00
Ben Payne 0ffd7f5620 Fix member vars left uninitialized in constructors 2015-02-20 18:41:51 -05:00
Nathan Bowhay 69b1c0072c Allowed for WebSocket reading
Allowed for WebSocket reading in script.
2015-02-12 12:19:56 -08:00
Nathan Bowhay 1d20f6d26a Fixed spacing issues
Changed spacing from tabs to 3 spaces.
2015-02-12 12:18:34 -08:00
Nathan Bowhay 0915a642a5 Optimized file reading to buffer
Optimized the code that reads the file to the buffer as suggested by
@jamesu
2015-02-12 12:07:55 -08:00
Azaezel 16ed4d2811 stack corruption's bad, mmmmkay? 2015-02-09 19:04:51 -06:00
James Urquhart 3f97c2cedd Fix building on GCC 2015-02-09 16:14:14 +00:00
Azaezel 5bbbe7bbe2 extra entry in DefineConsoleFunction( queryMasterServer
looks like a copypasta slip up.
2015-02-09 02:12:25 -06:00
James Urquhart f44a3f27d6 Fix stack balancing problems by refactoring execution calls
- Con::executef now uses a template
- All public execution functions now restore the console stack upon return
- Fixed bad parameters on some callbacks
- Reverts get*Arg behavior
2015-02-08 00:08:18 +00:00
Nathan Bowhay 0a76809092 Opened finishLastLine to script
Opened finishLastLine to script so you can eat the rest of the lines in
script.
2015-02-05 11:44:32 -08:00
Nathan Bowhay 5f0b3984fc Added sendFile method
Added a method to send an entire file over tcp.
2015-02-05 11:43:56 -08:00
Nathan Bowhay a0250e6c6b Added callback when we read all lines
Added a script callback when all lines have been read.
2015-02-05 11:41:44 -08:00
Nathan Bowhay 7ef3a64957 Added getLocalTime console function
Add getLocalTime console function so that script has access to the local
time.
2015-02-05 11:28:19 -08:00
Daniel Buckmaster 014b566014 Merge remote-tracking branch 'gg/development-3.6' into development
Conflicts:
	Engine/source/T3D/gameFunctions.cpp
2015-01-29 21:17:38 +11:00
Daniel Buckmaster bc12f13e9a Rename netTest.cpp to netExamples.cpp 2015-01-28 09:53:04 +11:00
LuisAntonRebollo aa35157eef PlatformSDL implementation. 2015-01-19 01:17:37 +01:00
Daniel Buckmaster 05b8fe4423 Bump version numbers. 2014-12-29 12:32:45 +11:00
Daniel Buckmaster ae284a89ec Merge branch 'development' into defineconsolemethod
Conflicts:
	Engine/source/materials/materialDefinition.cpp
2014-12-26 13:22:16 +11:00
Daniel Buckmaster 3ab048c5b0 Fixes after feedback from Luis.
* Made use of dStrIsEmpty in more locations (and fixed it :P)
 * Removed commented-out code
 * Corrected default params
 * Fixed some console warning formats
 * Removed tabs
 * Corrected setExtent API
2014-12-23 18:48:02 +11:00
Daniel Buckmaster 9396ae7176 Merge remote-tracking branch 'Winterleaf/Development-Console' into defineconsolemethod
Conflicts:
	Engine/source/T3D/missionMarker.cpp
2014-12-21 21:23:55 +11:00
Vincent Gee 16765aceca Bit Alignment of variables in serverQuery.cpp 2014-11-30 19:06:27 -05:00
Daniel Buckmaster c354f59b72 Merge pull request #922 from eightyeight/fix-http-post
Make HTTPObject::post work
2014-11-08 15:35:32 +11:00
Daniel Buckmaster 697dbb13b3 Make HTTPObject::post work. 2014-11-08 15:34:15 +11:00
Daniel Buckmaster 3082bb3adc Merge pull request #884 from GarageGames/development-3.6
Version 3.6.2
2014-11-05 20:28:01 +11:00
Vincent Gee acb192e2a5 Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro. 2014-11-03 22:42:51 -05:00
Daniel Buckmaster dc92d58692 Update version.h 2014-11-04 11:12:15 +11:00
Daniel Buckmaster 81a385094f Merge pull request #842 from eightyeight/console-func-refactor
jamesu's console function refactor
2014-10-24 00:42:58 +11:00
Daniel Buckmaster 2f416290ab Merge pull request #788 from eightyeight/return-status-code
Allow return status to be specified using quitWithStatus
2014-10-24 00:31:05 +11:00
Daniel Buckmaster b507dc9555 Merge branch 'master' into console-func-refactor
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
2014-10-14 15:09:11 +11:00
Daniel Buckmaster 06a4db295a Bump version to 3.6.1. 2014-10-06 14:51:39 +11:00
Daniel Buckmaster 1008236053 Bump version numbers. 2014-09-26 13:11:29 +10:00
Daniel Buckmaster 9f47032522 Allow return status to be specified using quitWithStatus. 2014-09-24 09:24:29 +10:00
bank f3fc84738b Use fixed buffer size var when allocating return buffer from console.
Conflicts:
	Engine/source/T3D/missionArea.cpp
	Engine/source/gui/editor/guiDebugger.cpp
2014-06-11 13:09:55 +04:00
Daniel Buckmaster 87d9e245b7 Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
2014-04-04 13:43:25 +11:00
Thomas Fischer 39b893f1ca Merge pull request #465 from skaughtx0r/Fix-HTTPObject
Fix bug in HTTPObject (Fixed)
2014-03-14 19:32:54 +01:00
DavidWyand-GG d49093cea6 Update version reporting to 3.5.1 2014-03-03 17:22:06 -05:00
DavidWyand-GG 9d136e8dd8 Update version reporting to 3.5 2013-11-13 02:32:22 -05:00
Scott Przybylski 678ea8211b processLine doesn't override base virtual function
The processLine definition differs from the base TCPObject class causing the function to never be called. This causes HTTPObject to not function properly, it calls back into the Torque Script with the HTTP headers when it should only be returning the content.
2013-08-12 16:05:12 -07:00
cpusci 4c35fd37af Simple pass over the codebase to standardize the platform types. 2013-08-04 16:26:01 -05:00
Vincent Gee 47446941cb Created Header file for net.cpp 2013-06-14 10:12:34 -04:00
SilentMike ca2c143feb Merge pull request #363 from thecelloman/productstring
Fill in missing case for getEngineProductString switch block.
2013-04-30 09:57:09 -07:00
thecelloman da0db2a382 Fill in missing case for getEngineProductString switch block. 2013-04-29 20:59:34 -04:00
thecelloman f9d52147ac Version number change.
Also adds console functions to get the user's application version.
2013-04-23 23:09:21 -04:00
Thomas Fischer ffc1ee829b moved filesystem init further up, to be able to log errors earlier 2013-04-15 18:58:29 +02:00
DavidWyand-GG 539efcb1e1 Input event changes
- New InputEventManager class.  It will be used by 3rd party input
devices to generate Torque 3D input events.
- Expanded the input event signal to include three new floats and a new
integer.
- Expanded the number of joystick buttons to 48.
- The input virtual map is now extendable rather than hard coded.
- The input devices types are now extendable rather than hard coded.
- New SI_POS, SI_ROT, SI_INT, and SI_FLOAT input event types.
- New SI_VALUE input action type.
- ActionMap has been updated to work with these changes.
- Removed unnecessary references to platform/event.h
2013-01-22 18:17:41 -05:00
DavidWyand-GG 59aaaf1892 Merge branch 'consolefuncrefactor' of https://github.com/jamesu/Torque3D into consolefuncrefactor 2013-01-07 12:09:22 -05:00