137 Commits

Author SHA1 Message Date
Giles Williams
b3a1e9b8ff added planets to the background scene code and implemented putting them into the background of the system info screen
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@458 127b21dd-08f5-0310-b4b7-95ae10353056
2006-04-12 10:26:44 +00:00
Giles Williams
be9e581b14 small change in one key from status-commander to status-commander-@ to reflect use of formatting in the string consistant with other keys
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@450 127b21dd-08f5-0310-b4b7-95ae10353056
2006-04-07 23:37:06 +00:00
dajt
451adaf698 Intro screens and most status screen constants moved to descriptions.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@447 127b21dd-08f5-0310-b4b7-95ae10353056
2006-04-07 12:19:54 +00:00
Giles Williams
e7e7a80d80 fix new docking port routines
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@433 127b21dd-08f5-0310-b4b7-95ae10353056
2006-04-05 01:36:36 +00:00
Giles Williams
4d2e0a6304 more custom sounds
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@425 127b21dd-08f5-0310-b4b7-95ae10353056
2006-04-04 00:12:18 +00:00
Giles Williams
8c84ba7c0c minor corrections ('a [15]' -> 'a[15]', 'a [26]' -> '[26]')
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@384 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-29 10:01:54 +00:00
Giles Williams
fe3d648696 no longer have vertical docking slits on stations (was early unfixed hack)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@383 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-29 09:26:06 +00:00
Giles Williams
ed8f0cbbf8 implemented a plist of custom sound effects (customsounds.plist) - some of which are new, others replace existing sound effects
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@364 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-24 10:17:41 +00:00
Giles Williams
c0778c523f fixed scanClass of Hardened Missile
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@329 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-14 23:39:25 +00:00
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
Giles Williams
d21b51ec2e implemented Target Memory Expansion
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@323 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-13 18:55:39 +00:00
Giles Williams
f2e4cdd45b scanner unzoom (shift-Z)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@319 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-13 12:11:02 +00:00
Giles Williams
8b02d25e3a fixed availability of items problems in setGuiToEquipShipScreen
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@303 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 11:52:45 +00:00
Giles Williams
bfa44411ef better pronunciation of 'metal fragment'
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@298 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 22:06:38 +00:00
Dylan Smith
670629b7e3 Merge in thor repo r1383
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@290 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-05 16:56:58 +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
d9a343e362 merge to OS X r1121
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@193 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-11 20:27:48 +00:00
Dylan Smith
8bbb1db7ff OS X r1116
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@192 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-08 21:48:25 +00:00
Dylan Smith
bf067605d1 OS X r1058 changes merged
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@183 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-30 10:39:35 +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
98b10f9e43 Merge with OS X rev 964 ready for 1.55-1
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@160 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-13 19:59:16 +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
Dylan Smith
237dd7e2dc Have a go at merging in interim 1.53 OS X changes
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@146 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-01 16:32:46 +00:00
Giles Williams
bac60cf62b big merge of latest Mac OSX work - may need some cleaning up
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@100 127b21dd-08f5-0310-b4b7-95ae10353056
2005-08-07 17:48:53 +00:00
Giles Williams
b0be11f219 making stations non-frangible
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@90 127b21dd-08f5-0310-b4b7-95ae10353056
2005-07-06 08:50:56 +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
51e0e5d75e Replaced left and right HUD images with text
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@79 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-16 10:03:37 +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
3e3535b890 changes and fixes from OSX r782
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@74 127b21dd-08f5-0310-b4b7-95ae10353056
2005-06-07 15:14:51 +00:00
Giles Williams
bacf679999 missile from latest OSX version
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@61 127b21dd-08f5-0310-b4b7-95ae10353056
2005-05-21 07:08:27 +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
dajt
0a3bf7b83a Changed MyOpenGLView to use SDL for video display
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@52 127b21dd-08f5-0310-b4b7-95ae10353056
2005-05-11 10:43:09 +00:00
Giles Williams
d7eae4e657 to bring sources up to Oolite r675
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@51 127b21dd-08f5-0310-b4b7-95ae10353056
2005-05-06 20:13:49 +00:00
dajt
1f39b147ef Changed sound code to use SDL
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@44 127b21dd-08f5-0310-b4b7-95ae10353056
2005-05-04 11:12:07 +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