lp:~armagetronad-dev/armagetronad/0.4-build_eclipse
Build helpers, originally developed for the Eclipse IDE, but useful without it. Check out parallel to the armagetronad source, enter it, and simple make targets allow you to build server and client in debug and optimized mode.
- Get this branch:
- bzr branch lp:~armagetronad-dev/armagetronad/0.4-build_eclipse
Branch merges
Branch information
Recent revisions
- 20. By z-man
-
Merging branch 0.2.8 from revision 8894 to 8901:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8901 | z-man | 2009-01-26 13:34:18 +0100 (Mon, 26 Jan 2009) | 2 linesMore .cvsignores removed.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r8900 | z-man | 2009-01-26 13:33:27 +0100 (Mon, 26 Jan 2009) | 2 linesRemoving obsolete .cvsignore files. Finally :)
------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 19. By Manuel Moos <manuel@kermit>
-
Merging branch 0.2.8 from revision 7747 to 7838:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7838 | nemostultae | 2008-02-10 08:26:33 +0100 (Sun, 10 Feb 2008) | 4 lines* Fixed dedicated compilation by adding a "Copy Headers" build phase to every target with the correct config.h for that target. The file's role is set to Project so it doesn't actually get copied. The other solution attempts failed: tried putting the src/macosx/
dedicated or src/macosx/client folder in the search path for each respective target, and header files aren't members of a target so we couldn't exclude them (annoying).
* Enabled auth server support on server
* Enabled ZThread support in both client and server
(not merged, conflicts, as usual)------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7837 | bazaarmagetron | 2008-02-10 01:34:23 +0100 (Sun, 10 Feb 2008) | 5 lineseGameObject:
:DeleteAll no longer calls Kill(), only RemoveFromGame().
Several spurious explosion generations in gCycle were removed.
The desired effect: no more unwanted explosions, and a cleaner game exit at round end.
Some arcane bits of ancient code were removed here, I hope without ill side effects.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7836 | z-man | 2008-02-10 00:45:02 +0100 (Sun, 10 Feb 2008) | 2 linesUpdated description
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7834 | wrtlprnft | 2008-02-09 23:18:19 +0100 (Sat, 09 Feb 2008) | 2 linesWrite a SACRIFICE message into ladderlog containing the player who used the hole, the player who went through it and the player who got holed, in that order.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7831 | z-man | 2008-02-09 22:04:58 +0100 (Sat, 09 Feb 2008) | 1 lineAbsolute -> relative path.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7830 | z-man | 2008-02-09 20:20:52 +0100 (Sat, 09 Feb 2008) | 2 linesArgh, push/pop matrix chaos. Better blinking now.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7829 | z-man | 2008-02-09 20:04:12 +0100 (Sat, 09 Feb 2008) | 2 linesInvulnerability blinking now only affects the cycle.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7828 | wrtlprnft | 2008-02-09 19:06:17 +0100 (Sat, 09 Feb 2008) | 2 linesprotect user.cfg from read access by other users on linux and (hopefully) mac OS
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7827 | z-man | 2008-02-09 17:50:49 +0100 (Sat, 09 Feb 2008) | 2 linesDisabling the hacky text-mode-only autopackage installation. Perhaps the new autopackage version I'm using doesn't crash any more.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7826 | z-man | 2008-02-09 17:49:38 +0100 (Sat, 09 Feb 2008) | 2 linesCommented out ALLOW_TEAM_
SHUFFLEUP, it triggered errors with authentication. ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7825 | z-man | 2008-02-09 17:07:47 +0100 (Sat, 09 Feb 2008) | 2 linesEnabling armathentication on autopackage builds.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7824 | z-man | 2008-02-09 16:43:00 +0100 (Sat, 09 Feb 2008) | 2 linesAdapted to picky versions of bash and test.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7823 | z-man | 2008-02-09 16:13:12 +0100 (Sat, 09 Feb 2008) | 1 lineExperimental: activating ZThread usage and Armathentication on Windows dedicated server build.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7822 | z-man | 2008-02-09 16:12:16 +0100 (Sat, 09 Feb 2008) | 1 lineAdapted to be able to use ZThread.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7821 | z-man | 2008-02-09 16:11:49 +0100 (Sat, 09 Feb 2008) | 1 lineAdded ZThread 2.3.2 with GCC 4 fixes.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7820 | z-man | 2008-02-09 16:11:31 +0100 (Sat, 09 Feb 2008) | 1 lineAdded ZThrad code::blocks build project.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7819 | wrtlprnft | 2008-02-09 15:26:59 +0100 (Sat, 09 Feb 2008) | 3 linesAdded a new flag that allows users to specify whether they want their identity to be hidden.
Maybe the serverside handling of it can be improved a bit by allowing users (like administrators) to only hide their access level without hiding their ID.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7818 | bazaarmagetron | 2008-02-09 14:09:31 +0100 (Sat, 09 Feb 2008) | 2 linesMade to work with vanilla unpatched zthread (-fpermisive test was broken)
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7817 | bazaarmagetron | 2008-02-09 13:33:32 +0100 (Sat, 09 Feb 2008) | 2 linesMOVE_TO no longer calls nMachine::OnKick; although it did so with zero severity, and that should have had no effect, it's better not to call it at all.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7816 | bazaarmagetron | 2008-02-09 13:15:14 +0100 (Sat, 09 Feb 2008) | 2 linesMoved game end code from DoRemoveFromGame to OnRemoveFromGame. Base class is now eReferencableGa
meObject. ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7815 | bazaarmagetron | 2008-02-09 11:47:41 +0100 (Sat, 09 Feb 2008) | 2 linesadded "nothing" target.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7814 | z-man | 2008-02-08 23:40:46 +0100 (Fri, 08 Feb 2008) | 2 linesMade resolution definition fixed size to avoid errors (there appeared to be one overwrite erorr on OSX already).
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7813 | z-man | 2008-02-08 19:45:41 +0100 (Fri, 08 Feb 2008) | 1 lineAdded gFirends
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7812 | z-man | 2008-02-08 19:45:11 +0100 (Fri, 08 Feb 2008) | 1 lineWin32 compatibility.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7811 | z-man | 2008-02-08 19:27:16 +0100 (Fri, 08 Feb 2008) | 2 lineseAuthentication here, too.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7810 | z-man | 2008-02-08 19:21:54 +0100 (Fri, 08 Feb 2008) | 1 lineCopied over from build_visualc. We don't use Visual C any more, so this here is a better place for the working version.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7809 | z-man | 2008-02-08 19:17:21 +0100 (Fri, 08 Feb 2008) | 2 linesOMG! More AuthentiFIcation. Empty stub files, but nevertheless.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7808 | z-man | 2008-02-08 19:11:52 +0100 (Fri, 08 Feb 2008) | 1 lineAuthentfication -> Authentication
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7807 | bazaarmagetron | 2008-02-08 18:14:37 +0100 (Fri, 08 Feb 2008) | 3 linesRequiring the most recent zthreads now.
Checking whether -fpermissive is required.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7806 | bazaarmagetron | 2008-02-08 18:04:48 +0100 (Fri, 08 Feb 2008) | 2 linesFixed authentication compilation this time.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7805 | bazaarmagetron | 2008-02-08 16:25:37 +0100 (Fri, 08 Feb 2008) | 2 linesadded bzrignore file.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7804 | bazaarmagetron | 2008-02-08 16:25:18 +0100 (Fri, 08 Feb 2008) | 2 linesAdapted to bzr branch names.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7803 | bazaarmagetron | 2008-02-08 14:48:41 +0100 (Fri, 08 Feb 2008) | 5 linesLet's see what happens if someone does not "bzr rebase", but "bzr merge" ro get his branch up to date.
merging:
Manuel Mooos 2008-02-08 More ignores for those who build directly in the source tree.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7802 | bazaarmagetron | 2008-02-08 14:48:03 +0100 (Fri, 08 Feb 2008) | 2 linesFixed compilation on non-armathentic
ation builds. ------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7801 | bazaarmagetron | 2008-02-08 14:42:51 +0100 (Fri, 08 Feb 2008) | 2 linesMore ignores for those who build directly in the source tree.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7800 | bazaarmagetron | 2008-02-08 13:52:15 +0100 (Fri, 08 Feb 2008) | 2 linesmore ignores.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7799 | bazaarmagetron | 2008-02-08 13:51:44 +0100 (Fri, 08 Feb 2008) | 2 linesAuthentication changes are now visible in /players output right away; /logout and /login in the same round should no longer enforce keeping the authority.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7798 | bazaarmagetron | 2008-02-08 13:30:06 +0100 (Fri, 08 Feb 2008) | 2 linesAdded bzr ignore rules.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7794 | bazaarmagetron | 2008-02-08 12:52:08 +0100 (Fri, 08 Feb 2008) | 1 lineEmpty merge to keep the peace between svn and bzr.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7793 | bazaarmagetron | 2008-02-08 12:51:53 +0100 (Fri, 08 Feb 2008) | 2 linesundone one silly commit.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7792 | z-man | 2008-02-08 12:44:38 +0100 (Fri, 08 Feb 2008) | 2 linesundone second silly commit.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7791 | bazaarmagetron | 2008-02-08 12:29:28 +0100 (Fri, 08 Feb 2008) | 3 linesmerging:
Manuel Mooos 2008-02-08 ...new algorithm handles things.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7790 | bazaarmagetron | 2008-02-08 12:28:59 +0100 (Fri, 08 Feb 2008) | 2 lines...new algorithm handles things.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7789 | z-man | 2008-02-08 12:18:27 +0100 (Fri, 08 Feb 2008) | 2 linesNot bad, but let's see how...
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7788 | bazaarmagetron | 2008-02-08 11:32:27 +0100 (Fri, 08 Feb 2008) | 3 linesmerging:
Manuel Mooos 2008-02-08 ...simultaneous commits from svn and bzr!------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7787 | z-man | 2008-02-08 11:29:21 +0100 (Fri, 08 Feb 2008) | 3 linesMade more reliable.
Also, let's find out how the svn/bzr syncing handles...------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7786 | bazaarmagetron | 2008-02-08 10:40:32 +0100 (Fri, 08 Feb 2008) | 2 linesadded ignore list.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7785 | bazaarmagetron | 2008-02-08 10:40:10 +0100 (Fri, 08 Feb 2008) | 2 lineswhoops, set wrong variable.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7784 | bazaarmagetron | 2008-02-08 10:04:50 +0100 (Fri, 08 Feb 2008) | 2 linesAdded source finding so this works nicely with default named bzr branches/checkouts.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7777 | wrtlprnft | 2008-02-07 23:29:19 +0100 (Thu, 07 Feb 2008) | 2 linesImplemented ramps and flying cycles
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7774 | bazaarmagetron | 2008-02-07 21:42:48 +0100 (Thu, 07 Feb 2008) | 2 linestron -> tronad
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7770 | wrtlprnft | 2008-02-06 22:45:38 +0100 (Wed, 06 Feb 2008) | 2 linesI like z-man's version better than mine. I hope this carries over to BZR ok
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7769 | bazaarmagetron | 2008-02-06 22:42:47 +0100 (Wed, 06 Feb 2008) | 2 linesupdated.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7764 | wrtlprnft | 2008-02-06 18:45:11 +0100 (Wed, 06 Feb 2008) | 2 lines-?!
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7763 | wrtlprnft | 2008-02-06 18:33:42 +0100 (Wed, 06 Feb 2008) | 3 linesDunno if this is a very good idea, but it saves you one keystroke:
If there's one of those enter password dialogs and the name that's suggested by the server matches a global ID (from any player) the password field is selected, otherwise it's the username field. Useful if you don't want to trust your password to user.cfg but still comfortably log in.------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7761 | z-man | 2008-02-06 16:06:20 +0100 (Wed, 06 Feb 2008) | 2 linesOk, now really fixed the libZThread compilation.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7760 | z-man | 2008-02-06 14:46:52 +0100 (Wed, 06 Feb 2008) | 2 linesRe-added HAVE_LIBZTHREAD define, it got lost.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7759 | z-man | 2008-02-06 14:36:41 +0100 (Wed, 06 Feb 2008) | 2 linesBetter test for ZThread. Taken from official Automake macro, and modified that it actually works.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7758 | z-man | 2008-02-06 14:35:17 +0100 (Wed, 06 Feb 2008) | 2 linesAdded call to delayed tasks while waiting for players.
------
------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r7751 | wrtlprnft | 2008-02-06 10:02:11 +0100 (Wed, 06 Feb 2008) | 2 linesremoved unused parameter of unused function
------
------- ------- ------- ------- ------- ------- ------- ------- ------- --- - 18. By z-man
-
Merging branch 0.2.8 from revision 4612 to 4640:
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4637 | z-man | 2006-05-30 23:56:23 +0200 (Tue, 30 May 2006) | 1 lineRenamed cvscheck to devcheck
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4636 | z-man | 2006-05-30 23:16:30 +0200 (Tue, 30 May 2006) | 1 lineDisabled custom memory manager globally. The external libraries weren't using it, so allocating in libxml2 and freeing in the game caused crashes.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4635 | z-man | 2006-05-30 22:49:12 +0200 (Tue, 30 May 2006) | 1 lineAdapted to armagetronad_
winlibs -> winlibs renaming (again)
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4632 | z-man | 2006-05-30 22:39:46 +0200 (Tue, 30 May 2006) | 1 lineDisabled precompiled headers, they don?\194?\180t seem to work properly (file system errors, no write permission, very mysterious)
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4630 | z-man | 2006-05-30 22:31:06 +0200 (Tue, 30 May 2006) | 1 lineAdapted to armagetronad_
winlibs -> winlibs renaming
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4629 | z-man | 2006-05-30 22:21:09 +0200 (Tue, 30 May 2006) | 1 linefixed distcheck
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4628 | z-man | 2006-05-30 17:23:21 +0200 (Tue, 30 May 2006) | 1 linefully switched to svn.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4627 | z-man | 2006-05-30 16:32:51 +0200 (Tue, 30 May 2006) | 1 lineTakes branch/tag info from SVN now to generate version from it.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4625 | z-man | 2006-05-30 09:14:08 +0200 (Tue, 30 May 2006) | 1 lineAdapted "make dist" for subversion, .svn directories are cleared as well
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4624 | z-man | 2006-05-30 09:13:18 +0200 (Tue, 30 May 2006) | 1 lineRenamed cvstest to devtest
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4619 | z-man | 2006-05-29 16:36:10 +0200 (Mon, 29 May 2006) | 1 lineSwitched form cvs2cl to svn log. svn2cl eats the whole memory, then dies.
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
r4618 | z-man | 2006-05-29 16:18:20 +0200 (Mon, 29 May 2006) | 1 lineFixed missing character bug on the lowest level
------------- ------- ------- ------- ------- ------- ------- ------- ------- ---
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)