14 Commits

Author SHA1 Message Date
Giles Williams
23c8889c96 implemented "missile_roles" to select missile chosen, and "rotating" to mark rotating station, fixed thargon untargetting and behemoth docking (phew!)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@326 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-14 00:54:36 +00:00
Dylan Smith
1264b83cf0 Move cocoa-merge (GUSTO) to trunk
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@289 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-05 16:26:25 +00:00
Dylan Smith
2ebb0e2260 OS X r1140
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@194 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-19 12:06:54 +00:00
Dylan Smith
da2be13ec0 merge OS X r1091 (v1.60)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@186 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-05 13:58:18 +00:00
Dylan Smith
207a37d0bc more merges
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@174 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-26 20:20:45 +00:00
Dylan Smith
6f818d4754 merge from OS X r1030
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@170 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-24 19:18:47 +00:00
Dylan Smith
653488e27e Nerge missed plist files to OS X revision 932
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@147 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-02 14:36:08 +00:00
Giles Williams
451232e5f2 various changes from Mac OS X r862
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@91 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-09 21:51:47 +00:00
Giles Williams
f04c6b8985 changes from OSX r850 **WARNING** Please check PlayerEntity.m is okay
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@87 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-05 11:59:46 +00:00
Giles Williams
305b324cda changes from OSX r807 - including the MASC'M and interstellar stuff
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@80 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-17 08:25:19 +00:00
dajt
bd201d29ff Putting XML plists back in place.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@77 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-08 10:22:59 +00:00
dajt
2a3ece755c Win32 changes, TextureStore uses SDL.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@76 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-08 10:14:52 +00:00
Giles Williams
6f9df08549 merging in changes from Oolite r675-r708 (efficiency in Entity management)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@53 127b21dd-08f5-0310-b4b7-95ae10353056
2005-05-12 09:14:15 +00:00
Dylan Smith
3274cb3ea6 organize the source tree somewhat better
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@30 127b21dd-08f5-0310-b4b7-95ae10353056
2005-04-28 21:47:22 +00:00