lp:~pnoexz/armagetronad/0.4

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~armagetronad-dev/armagetronad/0.4-armagetronad-work

Manuel Moos: Needs Resubmitting on 2012-10-13

Diff: 11947 lines (+4178/-4179)

11 files modified

language/american.txt (+1/-1)
language/british.txt (+1/-1)
language/deutsch.txt (+972/-972)
language/english_base.txt (+1/-1)
language/english_base_notranslate.txt (+1/-1)
language/french.txt (+45/-45)
language/new.txt (+1/-1)
language/polish.txt (+2381/-2382)
language/portugese.txt (+50/-49)
language/russian.txt (+0/-1)
language/spanish.txt (+725/-725)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1447. By Matias Pino on 2012-10-12

Set help files to UTF-8 and LF (Linux's new line)

1446. By Yann Kaiser on 2012-10-07

Fixed HAVE_LIBBOOST_THREAD not being set anymore

1445. By Yann Kaiser on 2012-10-07

Added cockpit variables top_other_score and top_other_score_team. Made the other score-related variables use the spectated player if the current player isn't on a team.

1444. By Yann Kaiser on 2012-10-07

test commit for fullermd

1443. By Yann Kaiser on 2012-10-07

Increased default wall colours from previous patch at pnoexz's request

1442. By Yann Kaiser on 2012-10-07

boost_thread 0.49 added boost_system as a dependency, updating LIBS to include it

1441. By z-man on 2012-10-07

Merging branch 0.2.8 from revision 10437 to 10460:
 ------------------------------------------------------------------------
 r10450 | bazaaarmagetron | 2012-09-16 23:55:05 +0200 (Sun, 16 Sep 2012) | 1 line

 Daniel Lee Harple: Fix and add a missing documentation string for ladderlog writers.
 ------------------------------------------------------------------------

1440. By dlh on 2012-10-07

Restrict LINE_HEIGHT to positive values. Fixes bug #1063012.

1439. By Matias Pino on 2012-10-07

Added settings for rim wall color.

1438. By Yann Kaiser on 2012-10-07

Commit vov's power and root cockpit functions