All Projects FSSCP  wxFRED

fs2open: wanderer r10418

Diff Back to Repository
Author Committer Branch Timestamp Parent
zookeeper wanderer 2014-02-07 06:27 Pending
Changeset Trunk sync r10135. A difficult merge due to n-seg shields and model point shields being practically impossible to combine. Priority was given to model point shields because they supercede n-seg shields anyway, so the latter is not functional anymore. Also, the code for custom shield segment strengths and recharge percents was based on the n-seg shield code, and will need to be updated.
mod - /branches/wanderer/code/ai/aicode.cpp Diff File
mod - /branches/wanderer/code/hud/hudescort.cpp Diff File
mod - /branches/wanderer/code/hud/hudshield.cpp Diff File
mod - /branches/wanderer/code/hud/hudshield.h Diff File
mod - /branches/wanderer/code/hud/hudtarget.cpp Diff File
mod - /branches/wanderer/code/io/keycontrol.cpp Diff File
mod - /branches/wanderer/code/mission/missionparse.cpp Diff File
mod - /branches/wanderer/code/mission/missionparse.h Diff File
mod - /branches/wanderer/code/model/model.h Diff File
mod - /branches/wanderer/code/model/modelread.cpp Diff File
mod - /branches/wanderer/code/network/multi_ingame.cpp Diff File
mod - /branches/wanderer/code/network/multi_obj.cpp Diff File
mod - /branches/wanderer/code/network/multimsgs.cpp Diff File
mod - /branches/wanderer/code/object/object.cpp Diff File
mod - /branches/wanderer/code/object/object.h Diff File
mod - /branches/wanderer/code/object/objectshield.cpp Diff File
mod - /branches/wanderer/code/object/objectshield.h Diff File
mod - /branches/wanderer/code/parse/lua.cpp Diff File
mod - /branches/wanderer/code/parse/sexp.cpp Diff File
mod - /branches/wanderer/code/ship/shield.cpp Diff File
mod - /branches/wanderer/code/ship/ship.cpp Diff File
mod - /branches/wanderer/code/ship/ship.h Diff File
mod - /branches/wanderer/code/ship/shiphit.cpp Diff File