Changesets: fs2open
|
trunk r9584 2013-03-15 20:48 Ported: N/A Details Diff |
Fix for mantis 2789: replace shield icons drawn with 100's of lines with 6-point polygons |
Affected Issues 0002789 |
|
| mod - /trunk/fs2_open/code/globalincs/pstypes.h | Diff File | ||
| mod - /trunk/fs2_open/code/graphics/2d.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/graphics/2d.h | Diff File | ||
| mod - /trunk/fs2_open/code/hud/hudshield.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/hud/hudshield.h | Diff File | ||
| mod - /trunk/fs2_open/code/render/3d.h | Diff File | ||
| mod - /trunk/fs2_open/code/render/3ddraw.cpp | Diff File | ||
|
trunk r9583 2013-03-15 03:48 Ported: N/A Details Diff |
Fixed an accidentally committed debug mprintf. | ||
| mod - /trunk/fs2_open/code/hud/hudconfig.cpp | Diff File | ||
|
trunk r9582 2013-03-15 03:32 Ported: N/A Details Diff |
Restored the code which loads up the default HUD colors from hud_3.hcf. Was apparently accidentally removed in r9549. | ||
| mod - /trunk/fs2_open/code/hud/hudconfig.cpp | Diff File | ||
|
trunk r9581 2013-03-14 13:06 Ported: N/A Details Diff |
Fixed gr_opengl_circle drawing the middle horizontal line twice, which is a problem when drawing with alpha. | ||
| mod - /trunk/fs2_open/code/graphics/gropengldraw.cpp | Diff File | ||
|
antipodes r9580 2013-03-13 18:32 Ported: N/A Details Diff |
Sync over r9194 from trunk. | ||
| mod - /branches/antipodes/code/gamesnd/gamesnd.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
|
antipodes r9579 2013-03-13 18:29 Ported: N/A Details Diff |
from trunk, committed with the pilot code. | ||
| mod - /branches/antipodes/code/math/vecmat.h | Diff File | ||
| mod - /branches/antipodes/code/model/model.h | Diff File | ||
| mod - /branches/antipodes/code/model/modelread.cpp | Diff File | ||
|
antipodes r9578 2013-03-13 18:17 Ported: N/A Details Diff |
Sync line endings on freespace.rc with trunk. | ||
| mod - /branches/antipodes/code/freespace2/freespace.rc | Diff File | ||
|
antipodes r9577 2013-03-13 18:15 Ported: N/A Details Diff |
This wasn't supposed to be in 9574. | ||
| mod - /branches/antipodes/code/gamesnd/gamesnd.cpp | Diff File | ||
|
antipodes r9576 2013-03-13 18:10 Ported: N/A Details Diff |
Trunk sync over r8579 that was missed apparently. | ||
| mod - /branches/antipodes/code/fred2/missionnotesdlg.cpp | Diff File | ||
|
antipodes r9575 2013-03-13 18:06 Ported: N/A Details Diff |
Trunk sync commit r9565. | ||
| mod - /branches/antipodes/code/network/multi.h | Diff File | ||
|
antipodes r9574 2013-03-13 18:04 Ported: N/A Details Diff |
Demo/standalone removal code from trunk to antipodes. | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.h | Diff File | ||
| mod - /branches/antipodes/code/gamesequence/gamesequence.cpp | Diff File | ||
| mod - /branches/antipodes/code/gamesequence/gamesequence.h | Diff File | ||
| mod - /branches/antipodes/code/gamesnd/gamesnd.cpp | Diff File | ||
| mod - /branches/antipodes/code/globalincs/version.h | Diff File | ||
| mod - /branches/antipodes/code/network/stand_gui.cpp | Diff File | ||
| mod - /branches/antipodes/code/ui/window.cpp | Diff File | ||
|
antipodes r9573 2013-03-13 18:01 Ported: N/A Details Diff |
Mainhall comment sync. | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
|
antipodes r9572 2013-03-13 17:52 Ported: N/A Details Diff |
Remnant differences from Inferno removal. | ||
| mod - /branches/antipodes/code/Makefile.am | Diff File | ||
| mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/FS2_Open.xcscheme | Diff File | ||
|
antipodes r9571 2013-03-13 17:50 Ported: N/A Details Diff |
More misc project differences. | ||
| mod - /branches/antipodes/projects/MSVC_2010/Freespace2.sln | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2011/Freespace2.sln | Diff File | ||
|
antipodes r9570 2013-03-13 17:42 Ported: N/A Details Diff |
More misc project file changes, properties on Xcode4 files. | ||
| mod - /branches/antipodes/projects/Xcode4/SDLMain.h | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/SDLMain.m | Diff File | ||
|
antipodes r9569 2013-03-13 17:39 Ported: N/A Details Diff |
Sync some misc project file differences against trunk. | ||
| mod - /branches/antipodes/projects/MSVC_2005/Freespace2.sln | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/code.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/MSVC_2005/wxFRED2.vcproj | Diff File | ||
| mod - /branches/antipodes/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/FS2_Open.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/cfilearchiver.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/cfileextractor.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/code.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/jpeg.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/lua.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/png.xcscheme | Diff File | ||
| mod - /branches/antipodes/projects/Xcode4/FS2_Open.xcodeproj/xcshareddata/xcschemes/zlib.xcscheme | Diff File | ||
|
antipodes r9568 2013-03-13 17:27 Ported: N/A Details Diff |
Sync whitespace/formatting/comment purge differences from trunk to Antipodes. | ||
| mod - /branches/antipodes/code/controlconfig/controlsconfigcommon.cpp | Diff File | ||
| mod - /branches/antipodes/code/cutscene/cutscenes.cpp | Diff File | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | Diff File | ||
| mod - /branches/antipodes/code/gamesnd/gamesnd.cpp | Diff File | ||
| mod - /branches/antipodes/code/globalincs/version.h | Diff File | ||
| mod - /branches/antipodes/code/hud/hudconfig.h | Diff File | ||
| mod - /branches/antipodes/code/hud/hudtarget.cpp | Diff File | ||
| mod - /branches/antipodes/code/io/key.cpp | Diff File | ||
| mod - /branches/antipodes/code/io/key.h | Diff File | ||
| mod - /branches/antipodes/code/io/keycontrol.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/mainhallmenu.cpp | Diff File | ||
| mod - /branches/antipodes/code/menuui/playermenu.cpp | Diff File | ||
| mod - /branches/antipodes/code/mission/missioncampaign.h | Diff File | ||
| mod - /branches/antipodes/code/missionui/redalert.cpp | Diff File | ||
| mod - /branches/antipodes/code/model/model.h | Diff File | ||
| mod - /branches/antipodes/code/model/modelread.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multi.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multi_campaign.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multi_observer.cpp | Diff File | ||
| mod - /branches/antipodes/code/network/multiutil.cpp | Diff File | ||
| mod - /branches/antipodes/code/parse/scripting.cpp | Diff File | ||
| mod - /branches/antipodes/code/playerman/managepilot.cpp | Diff File | ||
| mod - /branches/antipodes/code/playerman/managepilot.h | Diff File | ||
| mod - /branches/antipodes/code/playerman/player.h | Diff File | ||
| mod - /branches/antipodes/code/ship/ship.cpp | Diff File | ||
|
trunk r9567 2013-03-13 16:55 Ported: N/A Details Diff |
Missing doxproj from Antipodes. | ||
| add - /trunk/fs2_open/projects/MSVC_2008/Freespace2.doxproj | File | ||
|
antipodes r9566 2013-03-13 16:53 Ported: N/A Details Diff |
Trunk sync r9564, for easier differencing. | ||
| mod - /branches/antipodes/code/fred2/sexp_tree.cpp | Diff File | ||
| mod - /branches/antipodes/code/fred2/sexp_tree.h | Diff File | ||
| mod - /branches/antipodes/code/parse/sexp.cpp | Diff File | ||
| mod - /branches/antipodes/code/parse/sexp.h | Diff File | ||
|
trunk r9565 2013-03-12 01:06 Ported: N/A Details Diff |
Commit 9473 from anitpodes to prevent standalone crashing never ported over. Original commit message: "From Eli2: Lower the value of MAX_SHIPS_PER_PACKET to 64 in order to keep packet size down" |
||
| mod - /trunk/fs2_open/code/network/multi.h | Diff File | ||
|
trunk r9564 2013-03-11 02:14 Ported: N/A Details Diff |
For BluePlanet compatibility: change-nebula-pattern SEXP. Also adds a logging nprintf for op_num in add_to_event_log_buffer. |
||
| mod - /trunk/fs2_open/code/fred2/sexp_tree.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/fred2/sexp_tree.h | Diff File | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/parse/sexp.h | Diff File | ||
|
trunk r9563 2013-03-08 04:18 Ported: N/A Details Diff |
Need to back out temporary commit 9553 or it looks in inferno\inferno and \inferno for pilots. | ||
| mod - /trunk/fs2_open/code/cfile/cfilesystem.cpp | Diff File | ||
|
trunk r9562 2013-03-08 03:26 Ported: N/A Details Diff |
Fixed a syntax error. | ||
| mod - /trunk/fs2_open/code/io/key.cpp | Diff File | ||
|
trunk r9561 2013-03-08 00:22 Ported: N/A Details Diff |
*drum roll* Pilot Code! Originated by taylor. Additional direct work by: The E, niffiwan, CommanderDJ, Pyro3D, Echelon9 (PVS-Studio), Karajorma and Eli2. (If I missed you, don't kill me.) MASSIVE thanks to Mjn.Mixael and Blue Planet for tireless constant testing. (It's still not perfect, but it probably wouldn't be where it is at without them) Spans a lot from initial commit to AP Branch in r6835. |
||
| mod - /trunk/fs2_open/code/Makefile.am | Diff File | ||
| mod - /trunk/fs2_open/code/controlconfig/controlsconfig.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/controlconfig/controlsconfig.h | Diff File | ||
| mod - /trunk/fs2_open/code/controlconfig/controlsconfigcommon.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/cutscene/cutscenes.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/cutscene/cutscenes.h | Diff File | ||
| mod - /trunk/fs2_open/code/fred2/campaigneditordlg.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/fred2/campaigneditordlg.h | Diff File | ||
| mod - /trunk/fs2_open/code/fred2/missionsave.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/freespace2/freespace.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/fs2netd/fs2netd_client.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/gamesnd/gamesnd.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/globalincs/pstypes.h | Diff File | ||
| mod - /trunk/fs2_open/code/hud/hudconfig.h | Diff File | ||
| mod - /trunk/fs2_open/code/io/key.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/io/key.h | Diff File | ||
| mod - /trunk/fs2_open/code/io/keycontrol.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/math/vecmat.h | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/barracks.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/mainhallmenu.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/mainhallmenu.h | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/optionsmenu.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/playermenu.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/menuui/readyroom.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/mission/missioncampaign.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/mission/missioncampaign.h | Diff File | ||
| mod - /trunk/fs2_open/code/mission/missionload.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/mission/missionparse.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/missionui/redalert.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/missionui/redalert.h | Diff File | ||
| mod - /trunk/fs2_open/code/model/model.h | Diff File | ||
| mod - /trunk/fs2_open/code/model/modelread.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/network/multi.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/network/multi_campaign.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/network/multi_observer.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/network/multiui.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/network/multiutil.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/parse/lua.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/parse/lua.h | Diff File | ||
| add - /trunk/fs2_open/code/pilotfile | File | ||
| add - /trunk/fs2_open/code/pilotfile/csg.cpp | File | ||
| add - /trunk/fs2_open/code/pilotfile/csg_convert.cpp | File | ||
| add - /trunk/fs2_open/code/pilotfile/pilotfile.cpp | File | ||
| add - /trunk/fs2_open/code/pilotfile/pilotfile.h | File | ||
| add - /trunk/fs2_open/code/pilotfile/pilotfile_convert.cpp | File | ||
| add - /trunk/fs2_open/code/pilotfile/pilotfile_convert.h | File | ||
| add - /trunk/fs2_open/code/pilotfile/plr.cpp | File | ||
| add - /trunk/fs2_open/code/pilotfile/plr_convert.cpp | File | ||
| mod - /trunk/fs2_open/code/playerman/managepilot.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/playerman/managepilot.h | Diff File | ||
| mod - /trunk/fs2_open/code/playerman/player.h | Diff File | ||
| mod - /trunk/fs2_open/code/playerman/playercontrol.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/ship/ship.h | Diff File | ||
| mod - /trunk/fs2_open/code/stats/medals.cpp | Diff File | ||
| mod - /trunk/fs2_open/code/stats/medals.h | Diff File | ||
| mod - /trunk/fs2_open/code/stats/scoring.cpp | Diff File | ||
| mod - /trunk/fs2_open/projects/Eclipse/Freespace2/.project | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2005/code.vcproj | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2008/code.vcproj | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2010/code.vcxproj.filters | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2011/code.vcxproj | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_2011/code.vcxproj.filters | Diff File | ||
| mod - /trunk/fs2_open/projects/MSVC_6/code.dsp | Diff File | ||
| mod - /trunk/fs2_open/projects/Xcode/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /trunk/fs2_open/projects/Xcode4/FS2_Open.xcodeproj/project.pbxproj | Diff File | ||
| mod - /trunk/fs2_open/projects/codeblocks/code/code.cbp | Diff File | ||
|
trunk r9560 2013-03-07 05:35 Ported: N/A Details Diff |
Fix turrets not getting can_move = true set for them; fixes at least glowpoints parented to turrets not moving right. | ||
| mod - /trunk/fs2_open/code/model/modelread.cpp | Diff File | ||
