Changesets: fs2open
trunk r7326 2011-07-06 00:39 Ported: N/A Details Diff |
don't assert on a benign conflict | ||
mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
trunk r7325 2011-07-06 00:22 IssMneur Ported: N/A Details Diff |
From Valathil: Vary the intensity of lighting from warp fireballs (wormhole) based on the radius of the fireball. | ||
mod - /trunk/fs2_open/code/fireball/fireballs.cpp | Diff File | ||
mod - /trunk/fs2_open/code/fireball/fireballs.h | Diff File | ||
mod - /trunk/fs2_open/code/object/object.cpp | Diff File | ||
antipodes r7324 2011-07-05 08:40 The_E Ported: N/A Details Diff |
Trunk sync r7223 | ||
mod - /branches/antipodes/code/globalincs/def_files.cpp | Diff File | ||
trunk r7323 2011-07-05 08:35 The_E Ported: N/A Details Diff |
New FXAA shaders. These have an increased preset range, going from 0 to 9 inclusive. Presets 0 - 4 use the "Console" version of the algorithm, 5 - 9 get the "PC" version | ||
mod - /trunk/fs2_open/code/globalincs/def_files.cpp | Diff File | ||
trunk r7322 2011-07-04 10:59 The_E Ported: N/A Details Diff |
Wasn't supposed to change this | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
antipodes r7321 2011-07-04 10:56 The_E Ported: N/A Details Diff |
Reverting changes due to unforeseen consequences. | ||
mod - /branches/antipodes/code/globalincs/def_files.cpp | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglpostprocessing.cpp | Diff File | ||
trunk r7320 2011-07-04 10:55 The_E Ported: N/A Details Diff |
Reverting, due to unforeseen consequences | ||
mod - /trunk/fs2_open/code/globalincs/def_files.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengl.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp | Diff File | ||
antipodes r7319 2011-07-04 10:25 Ported: N/A Details Diff |
Whoops. My bad. | ||
mod - /branches/antipodes/code/globalincs/version.h | Diff File | ||
trunk r7318 2011-07-04 09:59 The_E Ported: N/A Details Diff |
Small update to the FXAA shaders. Also adds a function for shader uniform access that was previously missing. | ||
mod - /trunk/fs2_open/code/globalincs/def_files.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengl.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglpostprocessing.cpp | Diff File | ||
antipodes r7317 2011-07-04 09:08 The_E Ported: N/A Details Diff |
Small update to the FXAA shaders. Also adds a function for shader uniform access that was previously missing. |
||
mod - /branches/antipodes/code/globalincs/def_files.cpp | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglextension.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglpostprocessing.cpp | Diff File | ||
antipodes r7316 2011-07-04 02:41 Ported: N/A Details Diff |
Trunk Sync - r7315 | ||
mod - /branches/antipodes/code/cfile/cfilesystem.cpp | Diff File | ||
mod - /branches/antipodes/code/cmdline/cmdline.cpp | Diff File | ||
mod - /branches/antipodes/code/cmdline/cmdline.h | Diff File | ||
mod - /branches/antipodes/code/debugconsole/timerbar.h | Diff File | ||
mod - /branches/antipodes/code/fred2/fred.rc | Diff File | ||
mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
mod - /branches/antipodes/code/globalincs/def_files.cpp | Diff File | ||
mod - /branches/antipodes/code/globalincs/version.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gl/Glext.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gl/wglext.h | Diff File | ||
mod - /branches/antipodes/code/graphics/gropengl.cpp | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /branches/antipodes/code/hud/hudartillery.cpp | Diff File | ||
mod - /branches/antipodes/code/model/modelinterp.cpp | Diff File | ||
trunk r7315 2011-07-03 22:22 Ported: N/A Details Diff |
Add a separator between paste and add paste in the event editor. | ||
mod - /trunk/fs2_open/code/fred2/fred.rc | Diff File | ||
trunk r7314 2011-07-03 10:44 Ported: N/A Details Diff |
I should sleep more. 7307 was to add a "{ "glUniform4fARB", 0 }," not another v. | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp | Diff File | ||
trunk r7313 2011-07-03 04:40 The_E Ported: N/A Details Diff |
Updating these to current official versions | ||
mod - /trunk/fs2_open/code/graphics/gl/Glext.h | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gl/wglext.h | Diff File | ||
trunk r7312 2011-07-02 15:45 The_E Ported: N/A Details Diff |
And -oldfire, which does nothing, goes to the grave. |
||
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cmdline/cmdline.h | Diff File | ||
trunk r7311 2011-07-02 15:43 The_E Ported: N/A Details Diff |
And -safeloading bites the dust too. |
||
mod - /trunk/fs2_open/code/cfile/cfilesystem.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cmdline/cmdline.h | Diff File | ||
trunk r7310 2011-07-02 15:33 The_E Ported: N/A Details Diff |
Removing several deprecated/unused cmdline options. Victims this round are: -cell, -timerbar and -d3d_bad_tsys |
||
mod - /trunk/fs2_open/code/cmdline/cmdline.cpp | Diff File | ||
mod - /trunk/fs2_open/code/cmdline/cmdline.h | Diff File | ||
mod - /trunk/fs2_open/code/debugconsole/timerbar.h | Diff File | ||
mod - /trunk/fs2_open/code/freespace2/freespace.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropengl.cpp | Diff File | ||
mod - /trunk/fs2_open/code/model/modelinterp.cpp | Diff File | ||
trunk r7309 2011-07-02 01:07 Ported: N/A Details Diff |
Fix for SSM usage causing Assert. If warp lifetime must be 4 seconds or greater, how about we warn them (in parsing) before they try and use it (and thus set it to at least 4.0) instead? Thanks to bigchunk1 for catching this one and to IssMneur for the assist and review. |
||
mod - /trunk/fs2_open/code/hud/hudartillery.cpp | Diff File | ||
antipodes r7308 2011-07-01 21:03 Ported: N/A Details Diff |
Copy of Trunk 7307. | ||
mod - /branches/antipodes/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /branches/antipodes/code/graphics/gropenglextension.h | Diff File | ||
trunk r7307 2011-07-01 21:02 Ported: N/A Details Diff |
This is the right way to do it. Correct version of 7304. |
||
mod - /trunk/fs2_open/code/graphics/gropenglextension.cpp | Diff File | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
trunk r7306 2011-07-01 20:14 Ported: N/A Details Diff |
...but apparently not that way. | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
antipodes r7305 2011-07-01 19:40 Ported: N/A Details Diff |
Trunk 7304 Copy | ||
mod - /branches/antipodes/code/graphics/gropenglextension.h | Diff File | ||
trunk r7304 2011-07-01 19:37 Ported: N/A Details Diff |
OGL_UNIFORM4FV should be (and now is) preceded by OGL_UNIFORM4F. | ||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File | ||
trunk r7303 2011-07-01 15:09 The_E Ported: N/A Details Diff |
Built-in bloom shader adjusted for higher quality |
||
mod - /trunk/fs2_open/code/globalincs/def_files.cpp | Diff File | ||
trunk r7302 2011-07-01 15:00 The_E Ported: N/A Details Diff |
Minor typo correction. Thanks to Valathil for finding it. |
||
mod - /trunk/fs2_open/code/graphics/gropenglextension.h | Diff File |