Anis
09b6a06bbc
wrong merge fix
2014-11-27 20:56:24 +01:00
Anis A. Hireche
a954daa43f
terrain_blending_opengl_port_from_lukas_code
2014-11-27 20:56:23 +01:00
Daniel Buckmaster
d01b48c93e
Merge pull request #885 from GarageGames/development-3.6
...
Version 3.6.2
2014-11-05 20:28:04 +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
e2435e39d0
Update README with new links and version number.
2014-11-04 11:12:21 +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
2f1d787b13
Merge pull request #868 from GarageGames/contributing-doc
...
Contributing doc
2014-11-04 11:03:39 +11:00
Daniel Buckmaster
1e47b7bf44
Mention code style guidelines.
2014-11-02 08:04:12 +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
8de36576cd
Merge pull request #880 from eightyeight/issue-180
...
Improve documentation on getCursorPos and fix cursorInControl
2014-11-02 07:55:24 +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
153d611bcd
Merge pull request #878 from eightyeight/issue-98
...
Prevent crash when loading Player with no shape
2014-10-31 10:07:29 +11:00
Daniel Buckmaster
a87a891cfc
Prevent crash when loading Player with no shape.
2014-10-31 10:04:32 +11:00
Daniel Buckmaster
b97c4eff6c
Merge pull request #875 from eightyeight/fix-tsshape-bounds-collision
...
Use existing methods instead of incorrect maths
2014-10-31 09:21:41 +11:00
Daniel Buckmaster
e209cc4389
Use existing methods instead of incorrect maths.
2014-10-31 09:11:07 +11:00
Daniel Buckmaster
644225db92
Merge pull request #874 from eightyeight/enable-gamepad-earlier
...
Enable gamepad input when the startup GUI wakes
2014-10-31 08:25:37 +11:00
Daniel Buckmaster
f3b08501c0
Enable gamepad input when the startup GUI wakes.
2014-10-31 08:07:19 +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
355ce5d854
Andrew's fix for ear transform with detached camera.
2014-10-28 09:26:46 +11:00
Daniel Buckmaster
fd93397e5d
Merge pull request #846 from Azaezel/guiobjectview
...
guiobjectview corrections
2014-10-27 17:28:58 +11:00
Daniel Buckmaster
8e1a323e18
Fixed typos.
2014-10-27 17:25:26 +11:00
Daniel Buckmaster
d73ddc5d77
Create CONTRIBUTING.md
2014-10-27 17:22:50 +11:00
Daniel Buckmaster
a17a5ee43a
Merge pull request #854 from eightyeight/fix-rigidshape-group
...
New Physics doc group
2014-10-24 09:19:17 +11:00
Daniel Buckmaster
4fb820c3ef
New Physics doc group.
2014-10-24 09:17:48 +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
2d9029cb99
Merge pull request #840 from eightyeight/fix-postfx-presets
...
Disable all post effects by default
2014-10-21 21:15:04 +11:00
Daniel Buckmaster
b9ebe479a3
Disable all post effects by default.
2014-10-19 20:45:27 +11:00
Daniel Buckmaster
7162fd609d
Merge pull request #839 from eightyeight/bank-fixes
...
Some engine fixes
2014-10-19 14:33:10 +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
7ac8e3dd6f
Merge pull request #703 from 'Azaezel/dontCloneDynamicCubemaps'
2014-10-14 13:54:18 +11:00
Daniel Buckmaster
effa335c26
Merge pull request #693 from 'Azaezel/Metrics_Keybind'
2014-10-12 15:06:56 +11:00
Daniel Buckmaster
6b2f334d98
Merge pull request #820 from GarageGames/development-3.6
...
Version 3.6.1
2014-10-08 08:50:40 +11:00
Daniel Buckmaster
5dfaa01e90
Merge pull request #817 from eightyeight/version-3.6.1
...
Bump version to 3.6.1
2014-10-06 14:57:24 +11:00
Daniel Buckmaster
b0c73fff55
Merge pull request #818 from eightyeight/fix-art
...
Fixed Full template art a bit
2014-10-06 14:56:52 +11:00
Daniel Buckmaster
06a4db295a
Bump version to 3.6.1.
2014-10-06 14:51:39 +11:00
Daniel Buckmaster
a8d9f6c499
Fixed Full template art a bit.
...
Player can now swim properly, and the physical zone elevator is a bit
more helpful (i.e. it sends you to the landing rather than leaving you
floating in midair). Fiddled some more with PostFX settings.
2014-10-06 12:58:32 +11:00
Daniel Buckmaster
753d829675
Merge pull request #813 from eightyeight/fix-outpost-terrain
...
Fixed minor issues with Outpost level
2014-10-04 20:45:27 +10:00
Daniel Buckmaster
e5bc07010c
Fixed minor issues with Outpost level.
...
* Black spots caused by wrongly named images.
* HDR settings tweaked to be a bit brighter.
2014-10-04 20:30:27 +10:00
Daniel Buckmaster
b8b762805f
Merge pull request #811 from LuisAntonRebollo/fix_opcode_x64
...
Fixed OPCODE problems with x64.
2014-10-04 20:16:36 +10:00
LuisAntonRebollo
46ffb3455b
Fixed OPCODE problems with x64.
2014-10-04 11:20:43 +02:00
Daniel Buckmaster
c6e265d789
Merge pull request #808 from GarageGames/development
...
Version 3.6
2014-10-03 11:04:42 +10:00
Daniel Buckmaster
5103ba22e2
Merge pull request #807 from eightyeight/az_outpost
...
Added Outpost testing level by Azaezel
2014-10-03 09:34:30 +10: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
Areloch
099a91553a
Merge pull request #723 from Azaezel/lightRay_Cleanup
...
Light ray cleanup
2014-10-01 22:34:23 -05:00