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
|
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
|
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
|
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
|
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
|
329be0afc3
|
bumped version number so weeviloid2.oxp should work
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@98 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-07-12 14:11:10 +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
|
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
|
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 |
|
dajt
|
96dbb457b5
|
Added 'oneof' comparison for scripts, changed version number to 1.51.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@81 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-06-18 20:54:26 +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 |
|
dajt
|
1b8cd1306b
|
Added mouse handling and loading saved game from command line.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@71 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-05-31 12:10:03 +00:00 |
|
dajt
|
48b534869d
|
Added condition and message lists
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@70 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-05-25 10:26:48 +00:00 |
|
dajt
|
30ddb86a5a
|
Added AI documentation file
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@69 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-05-25 09:39:07 +00:00 |
|
Giles Williams
|
6f3ce99d6d
|
untested merge of changes from OSX r749
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@62 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-05-21 08:15:49 +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
|
4c189f5e39
|
package shell script updates + binary packager
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@32 127b21dd-08f5-0310-b4b7-95ae10353056
|
2005-04-28 22:55:03 +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 |
|