lp:~armagetronad-sty-0.3/armagetronad/armagetronad-sty-help-compat

Branch merges

Propose for merging

Merged into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

Manuel Moos: Approve on 2009-03-13

Diff: None lines api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

893. By Luke-Jr on 2009-03-13

HELP_MESSAGE alias to HELP_INTRODUCTORY_BLURB for compatibility with sty

892. By Luke-Jr on 2009-03-12

merge zones-v1v2-invisible branch

891. By z-man on 2009-03-11

Merging branch 0.2.8 from revision 9116 to 9143:
 ------------------------------------------------------------------------
 r9143 | bazaarmagetron | 2009-03-11 08:34:31 +0100 (Wed, 11 Mar 2009) | 5 lines

 author: Manuel Moos
 Removed obsolete (and wrongly calculated) goneRatio variable. This
 fixes sensor collision reports; they would sometimes falsely report a
 temporary wall behind a gridded wall as the first collision.

 ------------------------------------------------------------------------
 r9142 | bazaarmagetron | 2009-03-11 08:33:47 +0100 (Wed, 11 Mar 2009) | 2 lines

 Manuel Moos: Made it possible to switch viewports in four player mode.

 ------------------------------------------------------------------------
 r9141 | bazaarmagetron | 2009-03-11 08:33:04 +0100 (Wed, 11 Mar 2009) | 2 lines

 Manuel Moos: Also renamed SilenceAll variable intenally.

 ------------------------------------------------------------------------
 r9140 | bazaarmagetron | 2009-03-11 08:32:14 +0100 (Wed, 11 Mar 2009) | 2 lines

 Manuel Moos: renamed SILENCE_ALL -> SILENCE_DEFAULT.

 ------------------------------------------------------------------------
 r9139 | bazaarmagetron | 2009-03-11 08:30:38 +0100 (Wed, 11 Mar 2009) | 2 lines

 Manuel Moos: Reverting last revision for redunancy.

 ------------------------------------------------------------------------
 r9136 | bazaarmagetron | 2009-03-07 22:09:36 +0100 (Sat, 07 Mar 2009) | 2 lines

 Daniel Lee Harple: SILENCE_ALL can be used on the client to ignore chat from all players locally.

 ------------------------------------------------------------------------

890. By Manuel Moos on 2009-03-04

Fixed zone vanishing logic and the sumo collapse kill.

889. By Manuel Moos on 2009-03-04

Fixed zShape::setReferenceTime, it needs to update the tFunction members.

888. By Manuel Moos on 2009-03-04

Removed redundant sync request.

887. By z-man on 2009-03-04

Merging branch 0.2.8 from revision 9108 to 9116:
 ------------------------------------------------------------------------
 r9114 | bazaarmagetron | 2009-03-04 15:49:51 +0100 (Wed, 04 Mar 2009) | 2 lines

 Manuel Moos: Fixed comment typos.

 ------------------------------------------------------------------------
 r9113 | bazaarmagetron | 2009-03-04 13:23:52 +0100 (Wed, 04 Mar 2009) | 2 lines

 Manuel Moos: Updated translation and clarified original.

 ------------------------------------------------------------------------
 r9112 | bazaarmagetron | 2009-03-04 13:16:22 +0100 (Wed, 04 Mar 2009) | 2 lines

 Manuel Moos: Added LAG_FREQUENCY_THRESHOLD to better deal with lag clusterbombs.

 ------------------------------------------------------------------------

886. By Manuel Moos on 2009-03-03

Saving successful screen initializations so multiple instances sharing
configuration don't switch to unwanted setups.

885. By Manuel Moos on 2009-03-03

Automatic merging of commits that would change history order:
   ------------------------------------------------------------
   revno: 883.1.2
   committer: Manuel Moos <email address hidden>
   branch nick: armagetronad
   timestamp: Tue 2009-03-03 14:46:09 +0100
   message:
     Fetching correct camera for raycasts so camviews don't crash the client.
   ------------------------------------------------------------
   revno: 883.1.1
   committer: Manuel Moos <email address hidden>
   branch nick: armagetronad
   timestamp: Tue 2009-03-03 14:45:50 +0100
   message:
     Added missing _born initialization.

884. By z-man on 2009-03-03

Merging branch 0.2.8 from revision 9104 to 9108:
 ------------------------------------------------------------------------
 r9108 | bazaarmagetron | 2009-03-03 15:35:34 +0100 (Tue, 03 Mar 2009) | 6 lines

 author: Manuel Moos
 In debug mode, no longer check for desktop dimensions unless desktop
 fullscreen mode is selected. This avoids the annoying flickering and
 makes the window find an actually useful place on the desktop instead
 of jumping to the top left corner.

 ------------------------------------------------------------------------
 r9106 | bazaarmagetron | 2009-03-03 05:56:47 +0100 (Tue, 03 Mar 2009) | 1 line

 Daniel Lee Harple: more quick exit changes
 ------------------------------------------------------------------------