Commit graph

574 commits

Author SHA1 Message Date
Areloch
b5ce3fa8ad Merge pull request #903 from Winterleaf/MissionMarker
Looks good, don't see any problems. Merged.
2014-11-13 21:48:58 -06:00
Daniel Buckmaster
895cf59500 Merge pull request #890 from Winterleaf/Dev-depthSortList.cpp
Minor Improvement to depthSortList.cpp
2014-11-12 09:52:50 +11:00
Daniel Buckmaster
1f0209db78 Merge pull request #917 from jamesu/fix_audio_print
Fix bug where console stack was incorrectly used to print audio devices
2014-11-12 09:37:16 +11: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
James Urquhart
20acbfed04 Fix late night coding issue 2014-11-08 00:14:56 +00:00
James Urquhart
0e87023e46 Fix problem with formatting 2014-11-08 00:01:01 +00:00
James Urquhart
d041cbbb7a Fix bug where console stack was incorrectly used to print audio devices 2014-11-07 23:54:08 +00: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
fbc9660bc3 WaypointTeam never worked and if you look at the code you can see its not very clean. 2014-11-04 20:14:50 -05:00
Vincent Gee
f348313413 Minor Improvement to depthSortList.cpp 2014-11-04 06:18:24 -05:00
Daniel Buckmaster
9e4446046f Merge pull request #710 from lukaspj/3-Textures-Blending-Fix
3 textures blending fix
2014-11-04 17:06:04 +11:00
Daniel Buckmaster
97ae3445c9 Merge pull request #793 from lukaspj/Terrain-Basetex-Formats
Terrain basetex formats
2014-11-04 14:54:08 +11:00
Daniel Buckmaster
3902ebb861 Merge pull request #883 from eightyeight/update-readme-and-version
Update readme and version
2014-11-04 11:56:39 +11:00
Daniel Buckmaster
dc92d58692 Update version.h 2014-11-04 11:12:15 +11:00
Daniel Buckmaster
a61be8783a New Physics doc group. 2014-11-04 11:12:13 +11:00
Daniel Buckmaster
a8f246404a Merge pull request #879 from eightyeight/issue-825
Increment vertex pointer by 3, not 1
2014-11-02 07:56:51 +11:00
Daniel Buckmaster
378a933894 Merge pull request #690 from rextimmy/bullet_282
Bullet Physics Library 2.82 update
2014-11-02 07:54:48 +11:00
Daniel Buckmaster
f6d54d810b Improve documentation on getCursorPos and fix cursorInControl. 2014-11-02 07:51:03 +11:00
Daniel Buckmaster
d12310602d Increment vertex pointer by 3, not 1. 2014-11-02 07:35:39 +11:00
Daniel Buckmaster
a87a891cfc Prevent crash when loading Player with no shape. 2014-10-31 10:04:32 +11:00
Daniel Buckmaster
e209cc4389 Use existing methods instead of incorrect maths. 2014-10-31 09:11:07 +11:00
Daniel Buckmaster
ef9bc91bff Merge pull request #744 from lukaspj/Ribbon-Implementation
Ribbon and RibbonNode
2014-10-28 15:19:17 +11:00
Daniel Buckmaster
74e328d09b Merge pull request #870 from eightyeight/fix-ear-transform
Andrew's fix for ear transform with detached camera
2014-10-28 14:39:09 +11:00
Daniel Buckmaster
b88d3fde1f Merge pull request #829 from jamesu/namespace_link
Add console function to link namespaces
2014-10-28 14:12:46 +11:00
Daniel Buckmaster
19f91fee2b Added a setPosition function. 2014-10-28 14:10:22 +11:00
Daniel Buckmaster
e02e542717 Merge pull request #749 from lukaspj/MixedParticleRendering
Re-enable Mixed particle rendering
2014-10-28 09:50:02 +11:00
Daniel Buckmaster
355ce5d854 Andrew's fix for ear transform with detached camera. 2014-10-28 09:26:46 +11:00
Daniel Buckmaster
a4f7182de5 Fix omissions in astNodes.cpp. 2014-10-28 08:55:17 +11:00
Daniel Buckmaster
fd93397e5d Merge pull request #846 from Azaezel/guiobjectview
guiobjectview corrections
2014-10-27 17:28:58 +11:00
Daniel Buckmaster
4fb820c3ef New Physics doc group. 2014-10-24 09:17:48 +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
Azaezel
0dde7022c2 engine: corrects offsets for the guiobjectview gui element which displays materialized meshes, and exposes it's specialized renderering system to the postfx subsystem.
immediate purpose: corrected display
long term purpose: deferred display.
2014-10-23 05:03:28 -05:00
Daniel Buckmaster
4c07c55121 Merge branch 'development' into console-func-refactor
Conflicts:
	Engine/source/console/compiledEval.cpp
2014-10-20 09:29:44 +11:00
Daniel Buckmaster
376db9e097 Merge pull request #705 from andr3wmac/ConsoleReturnFix
Fix for unexpected behavior described in issue #704
2014-10-19 19:45:15 +11:00
bank
62006e8b3c Remove unneeded double-initialization of the vars. 2014-10-19 14:30:46 +11:00
bank
d9c5670e93 Fix possible array overrun.
We should clamp the index value to the size of the weaponMountNode[], which is ShapeBase::MaxMountedImages (4) and SceneObject::NumMountPoints = 31.
2014-10-19 14:30:43 +11:00
bank
c23f3fbd9f Fix initializing return buffer.
Use "bufSize", not the "buf" itself.
2014-10-19 14:30:37 +11:00
Daniel Buckmaster
1554ea6faf Merge pull request #833 from just-bank/fix-derefptr
Fix: Null'ed pointer usage, possible access violation.
2014-10-16 10:38:52 +11:00
Daniel Buckmaster
156aacf8b8 Ensure console function arg arrays are initialised. 2014-10-16 00:29:16 +11:00
James Urquhart
a22254ad0a Add console function to link namespaces 2014-10-14 18:52:02 +01:00
Daniel Buckmaster
561e26ea07 Merge pull request #721 from Azaezel/CubemapCleanup
deprecated functionality. T3D handles this in the reflector class.
2014-10-14 21:19:57 +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
0fb7266dbe Merge pull request #148 from eightyeight/simfindobject
Prevented looking up incorrect object handles
2014-10-14 13:56:33 +11:00
Daniel Buckmaster
7ac8e3dd6f Merge pull request #703 from 'Azaezel/dontCloneDynamicCubemaps' 2014-10-14 13:54:18 +11:00
Daniel Buckmaster
06a4db295a Bump version to 3.6.1. 2014-10-06 14:51:39 +11:00
LuisAntonRebollo
46ffb3455b Fixed OPCODE problems with x64. 2014-10-04 11:20:43 +02:00
Areloch
4716f76d5e Merge pull request #737 from Azaezel/queryStallPrevention
Query Stall Prevention
2014-10-01 23:48:53 -05:00
Azaezel
d5c42d0d44 Yikes. fatalityfix: need to create a platformtimer for the reference. 2014-10-01 23:35:06 -05:00