Changesets: fs2open
|
trunk r10159
Timestamp: 2013-11-24 23:52:50 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
some things don't need to be re-inited every time you pause the game | ||
| mod - /trunk/fs2_open/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
|
trunk r10158
Timestamp: 2013-11-24 23:31:27 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
set ballistic HUD gauge any time HUD is changed -- fixes Mantis 0002962 | ||
| mod - /trunk/fs2_open/code/hud/hudparse.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/hud/hudtarget.cpp | [ Diff ] [ File ] | ||
|
trunk r10157
Timestamp: 2013-11-24 22:31:47 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
add quotes | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
|
trunk r10156
Timestamp: 2013-11-24 13:38:13 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
fix some things that FreeBSD complained about | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
antipodes r10155
Timestamp: 2013-11-24 09:21:51 Author: m_m Ported: N/A [ Details ] [ Diff ] |
Changed most MessageBox calls to use SCP_Messagebox, also fixed some of the event processing. | ||
| mod - /branches/antipodes/code/cfile/cfile.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/cmdline/cmdline.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/io/timer.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/model/modelread.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/network/multi.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi.h | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi_unix.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/outwnd.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/sound/openal.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/sound/voicerec.cpp | [ Diff ] [ File ] | ||
|
antipodes r10154
Timestamp: 2013-11-24 08:49:27 Author: The_E Ported: N/A [ Details ] [ Diff ] |
Revert 10149. Needs more review | ||
| mod - /branches/antipodes/code/inetfile/chttpget.cpp | [ Diff ] [ File ] | ||
|
antipodes r10153
Timestamp: 2013-11-24 07:21:45 Author: Echelon9 Ported: N/A [ Details ] [ Diff ] |
Remove extraneous WIN32 #ifdef's | ||
| mod - /branches/antipodes/code/inetfile/chttpget.cpp | [ Diff ] [ File ] | ||
|
antipodes r10152
Timestamp: 2013-11-23 12:50:17 Author: m_m Ported: N/A [ Details ] [ Diff ] |
Derp, forgot to remove testing stuff. | ||
| mod - /branches/antipodes/code/graphics/gropengl.cpp | [ Diff ] [ File ] | ||
|
antipodes r10151
Timestamp: 2013-11-23 12:29:42 Author: The_E Ported: N/A [ Details ] [ Diff ] |
From m!m: Enables FRED building. IMPORTANT NOTE: This requires a patched libsdl, the patch is included in the libsdl directory. Binaries were provided by m!m. | ||
| mod - /branches/antipodes/code/fred2/fred.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/fred2/fredview.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/graphics/gropengl.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/io/mouse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi.h | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/code/osapi/osapi_unix.cpp | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/libsdl/lib/x64/SDL2.dll | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/libsdl/lib/x64/SDL2.lib | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/libsdl/lib/x86/SDL2.dll | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/libsdl/lib/x86/SDL2.lib | [ Diff ] [ File ] | ||
| add - /branches/antipodes/libsdl/sdl.patch | [ File ] | ||
| mod - /branches/antipodes/projects/MSVC_2011/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/projects/MSVC_2011/Freespace2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/projects/MSVC_2013/Fred2.vcxproj | [ Diff ] [ File ] | ||
| mod - /branches/antipodes/projects/MSVC_2013/Freespace2.vcxproj | [ Diff ] [ File ] | ||
|
trunk r10150
Timestamp: 2013-11-23 12:14:33 Author: Wanderer Ported: N/A [ Details ] [ Diff ] |
fix issue with burst firing secondaries - thanks to Goober for finding it | ||
| mod - /trunk/fs2_open/code/ai/aibig.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
antipodes r10149
Timestamp: 2013-11-23 12:13:45 Author: The_E Ported: N/A [ Details ] [ Diff ] |
Removes a bunch of win32 ifdefs | ||
| mod - /branches/antipodes/code/inetfile/chttpget.cpp | [ Diff ] [ File ] | ||
|
zookeeper r10148
Timestamp: 2013-11-22 14:47:12 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Fixed a merging screw-up which broke the $Action condition. | ||
| mod - /branches/zookeeper/code/parse/scripting.cpp | [ Diff ] [ File ] | ||
|
trunk r10147
Timestamp: 2013-11-22 12:16:32 Author: Wanderer Ported: N/A [ Details ] [ Diff ] |
feature commit: excluding weapons from linked fire penalty (per request) | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/weapon/weapon.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
|
antipodes r10146
Timestamp: 2013-11-22 11:57:03 Author: m_m Ported: N/A [ Details ] [ Diff ] |
Fixed crash in joy_ff_stop_effects caused by uninitialized function pointers. | ||
| mod - /branches/antipodes/code/io/joy_ff-sdl.cpp | [ Diff ] [ File ] | ||
|
trunk r10145
Timestamp: 2013-11-22 00:06:41 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Fix 0002959. Framebuffer explosions need framebuffer objects, or it seems we assert later in the code. | ||
| mod - /trunk/fs2_open/code/graphics/gropengldraw.cpp | [ Diff ] [ File ] | ||
|
trunk r10144
Timestamp: 2013-11-21 12:11:43 Author: chief1983 Ported: N/A [ Details ] [ Diff ] |
Recommit the ship.h part of 10082 as the OBO fixes seem to have fixed 0002958. | ||
| mod - /trunk/fs2_open/code/ship/ship.h | [ Diff ] [ File ] | ||
|
trunk r10143
Timestamp: 2013-11-21 04:29:49 Author: Echelon9 Ported: N/A [ Details ] [ Diff ] |
LLVM/Clang warns that a dangling else can occur without one level of braces | ||
| mod - /trunk/fs2_open/code/hud/hudshield.cpp | [ Diff ] [ File ] | ||
|
zookeeper r10142
Timestamp: 2013-11-21 04:11:18 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Trunk sync r10141. | ||
| mod - /branches/zookeeper/code/ai/aicode.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/fred.rc | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/missionsave.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/resource.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/shipflagsdlg.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/fred2/shipflagsdlg.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/freespace2/freespace.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/globalincs/systemvars.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/hud/hudlock.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/hud/hudtarget.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/localization/localize.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/mission/missionparse.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/missionui/missiondebrief.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/ship/ship.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/species_defs/species_defs.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/species_defs/species_defs.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/medals.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/medals.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/scoring.cpp | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/stats/scoring.h | [ Diff ] [ File ] | ||
| mod - /branches/zookeeper/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
|
trunk r10141
Timestamp: 2013-11-21 02:26:45 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
re-commit r10082, except for ship.h, because it's the size of the ship_weapon struct that's causing the mysterious crashes (Mantis 0002958) | ||
| mod - /trunk/fs2_open/code/weapon/weapon.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/weapon/weapons.cpp | [ Diff ] [ File ] | ||
|
trunk r10140
Timestamp: 2013-11-21 02:26:00 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
fix an off-by-one error | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
trunk r10139
Timestamp: 2013-11-21 02:23:55 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
fix Echelon9's fix >:( also add a judicious Assert for Mantis 0002958 |
||
| mod - /trunk/fs2_open/code/hud/hudlock.cpp | [ Diff ] [ File ] | ||
|
trunk r10138
Timestamp: 2013-11-21 01:50:05 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
Fix an actual Volition bug. This has AI balance implications, but it's already in the "pick a random weapon" section, so it will probably be all right. | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | [ Diff ] [ File ] | ||
|
trunk r10137
Timestamp: 2013-11-21 01:37:06 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Remember to initialize shield_point_augment_ctrls. | ||
| mod - /trunk/fs2_open/code/ship/ship.cpp | [ Diff ] [ File ] | ||
|
trunk r10136
Timestamp: 2013-11-21 01:05:45 Author: Goober5000 Ported: N/A [ Details ] [ Diff ] |
scramble messages on a per-ship basis | ||
| mod - /trunk/fs2_open/code/fred2/fred.rc | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/fred2/missionsave.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/fred2/resource.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/fred2/shipflagsdlg.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/fred2/shipflagsdlg.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/hud/hudtarget.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/mission/missionmessage.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/mission/missionparse.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/mission/missionparse.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/ship/ship.h | [ Diff ] [ File ] | ||
|
trunk r10135
Timestamp: 2013-11-21 01:03:50 Author: zookeeper Ported: N/A [ Details ] [ Diff ] |
Merged model point shields from zookeeper branch. | ||
| mod - /trunk/fs2_open/code/ai/aicode.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/hud/hudescort.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/hud/hudets.cpp | [ 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/hud/hudtarget.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/io/keycontrol.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/mission/missionparse.cpp | [ 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_ingame.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/network/multi_obj.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/network/multimsgs.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/collideshipship.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/collideshipweapon.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/object.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/object.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/objectshield.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/object/objectshield.h | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/lua.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/parse/sexp.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/ship/shield.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/ship/shiphit.cpp | [ Diff ] [ File ] | ||
| mod - /trunk/fs2_open/code/weapon/beam.cpp | [ Diff ] [ File ] | ||