lp:~z-man/armagetronad/cmake-rescue
- Get this branch:
- bzr branch lp:~z-man/armagetronad/cmake-rescue
Branch merges
Branch information
Recent revisions
- 794. By Manuel Moos
-
Added place for binary resources from where they´re just copied over to the included resource directory.
- 793. By z-man
-
Merging branch 0.2.8 from revision 8854 to 8863:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8863 | bazaarmagetron | 2009-01-19 01:32:55 +0100 (Mon, 19 Jan 2009) | 5 linesauthor: Manuel Moos
Worked around SDL/input system bug: composite characters (" + a -> ä)
never send SDL_KEYUP events when the last key is released, so the key
repeat system needs to ignore them.------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 792. By z-man
-
Merging branch 0.2.8 from revision 8852 to 8854:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8854 | bazaarmagetron | 2009-01-18 18:37:07 +0100 (Sun, 18 Jan 2009) | 2 linesManuel Moos: Removed faulty assertion.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 791. By z-man
-
Merging branch 0.2.8 from revision 8841 to 8852:
(Also: finally got gWinZone.* back in sync with 0.2.8. Future merges
should be possible again, yay.)
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8851 | bazaarmagetron | 2009-01-18 01:48:12 +0100 (Sun, 18 Jan 2009) | 2 linesManuel Moos: Applied hoop's zone rendering patch. 'tis good.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 790. By z-man
-
Merging branch 0.2.8 from revision 8824 to 8841:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8841 | bazaarmagetron | 2009-01-17 20:13:41 +0100 (Sat, 17 Jan 2009) | 1 lineManuel Moos: Merging own work.(fixes of zthread detection in acinclude)
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8831 | bazaarmagetron | 2009-01-16 22:02:03 +0100 (Fri, 16 Jan 2009) | 2 linesepsy: /op should now give messages when resulting access level is same as original.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8830 | bazaarmagetron | 2009-01-16 21:19:24 +0100 (Fri, 16 Jan 2009) | 2 linesDaniel Lee Harple: Corrected a word in the english language file.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8826 | bazaarmagetron | 2009-01-16 16:19:55 +0100 (Fri, 16 Jan 2009) | 4 linesauthor: Manuel Moos
Also accept authentication if client sends a server IP that matches
the resolved SERVER_DNS name.------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 786. By z-man
-
Merging branch 0.2.8 from revision 8822 to 8824:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8823 | bazaarmagetron | 2009-01-15 10:53:35 +0100 (Thu, 15 Jan 2009) | 4 linesauthor: Manuel Moos
Sending /team chat to sender via server controlled chat message, not
as a console message. This fixes any clientside decorations.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:armagetronad