4443 Commits

Author SHA1 Message Date
Dylan Smith
d9ecc2ef98 argh, fix typos
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@311 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 23:36:34 +00:00
Dylan Smith
8bd1330fa2 use uname -m not uname -p
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@310 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 22:59:37 +00:00
Dylan Smith
74bd6217f5 Nightly build script
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@309 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 22:49:07 +00:00
Dylan Smith
ae4bef0ba6 Fix copy of resources for debug build
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@308 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 21:57:57 +00:00
Giles Williams
f9b7d88a4c check n_faces and n_vertices while loading model and throw suitable exceptions if they're too large
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@307 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 14:47:49 +00:00
Giles Williams
6e1e051eb0 no longer assume images are stored as RGBA or RGB but also allow single plane images and throw errors for everything else
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@306 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 14:35:57 +00:00
Giles Williams
96b1a3ff65 respect extra_cargo key when describing ship for sale
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@305 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 14:15:53 +00:00
Giles Williams
ba81fb3137 respect <key>isCarrier</key><true/>|<false/> in shipdata.plist entries
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@304 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 13:59:47 +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
6183357466 fixed availability of items problems in setGuiToEquipShipScreen
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@302 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 11:52:00 +00:00
Giles Williams
1c12ee19e3 commented out 'Found mode:' message
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@301 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 11:51:12 +00:00
Giles Williams
d33d943da3 oops! set default ambient_level to 1.0
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@300 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-10 11:31:03 +00:00
Giles Williams
fbe22e1b1a Can now configure ambient light level in planetinfo.plist (<key>ambient_level</key><real>1.0</real>)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@299 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-09 12:35:51 +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
Giles Williams
28c91b801f stations are not scoopable (!)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@297 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 15:58:59 +00:00
Giles Williams
6055ce878c removed unnecessary items from Targets:Oolite:Link Binary With Libraries that prevented built product from working!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@296 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 12:51:37 +00:00
Giles Williams
d823ea3da6 fix to avoid 'ghost escape-pods' and other uncollidables
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@295 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 12:30:31 +00:00
Giles Williams
2becb095fe tidied up the 'classes' group, removing duplicate file references
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@294 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 12:24:50 +00:00
Giles Williams
1f9aad049b removed some references that were ancient history
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@293 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-06 09:49:34 +00:00
Dylan Smith
cf1507fab1 fix xcode project's location for Geometry.m et al, fix OS X behaviour for Load/Save commander
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@291 127b21dd-08f5-0310-b4b7-95ae10353056
2006-03-05 17:15:37 +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
04dee7fe04 fix injectors during countdown
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@196 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-19 16:37:14 +00:00
Dylan Smith
2436cb4585 oops, inadvertently knocked out division by zero check
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@195 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-19 16:14:59 +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
6003b0fe54 Mac OS X changes to r1110
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@191 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-08 20:51:45 +00:00
Dylan Smith
53c83e2909 Change Command to Ctrl for LoadSave
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@189 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-07 19:28:14 +00:00
Dylan Smith
72d2262558 Merge in OS X changes to r1107
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@188 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-07 19:20:54 +00:00
Dylan Smith
eda8b9dca2 fix merge errors
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@187 127b21dd-08f5-0310-b4b7-95ae10353056
2005-11-05 14:36:07 +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
04793e182c all I can say is 'argh'
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@185 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-30 22:16:39 +00:00
Dylan Smith
0f60b7c59a fix infinite loop in ResourceManager, bump version to -dev2
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@184 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-30 22:00:02 +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
c125a3249c Fix joystick setup in paused mode
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@182 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-29 16:28:40 +00:00
Dylan Smith
b4f5331caf Fix problem where no sticks are present, thrust axis assigned, keyboard can't be used for thurst
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@181 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-27 19:56:33 +00:00
Dylan Smith
eedcad4da0 Keypad arrow keys patch from <nix@esperi.org.uk>
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@180 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-27 19:46:47 +00:00
Dylan Smith
0cae338d5e Add ScannerExtension
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@179 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-27 19:26:54 +00:00
Dylan Smith
3ca8cdc424 Merge to OS X r1046
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@178 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-27 19:26:25 +00:00
Dylan Smith
5ddeaf04f3 merge fixes for Universe.m
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@177 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-26 21:13:35 +00:00
Dylan Smith
2ffadff91b kludge long string printing routine
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@176 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-26 20:51:48 +00:00
Dylan Smith
381a82f1a6 add WormholeEntity
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@175 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-26 20:21:09 +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
ee7420e4df Merge in OS X changes to r1036
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@172 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-25 20:15:27 +00:00
Dylan Smith
0f340723b9 bits that got missed from the merge
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@171 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-24 22:14:13 +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
96d0b83bc2 Resizable windows/fullscreen mode proper interaction
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@169 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-22 16:08:34 +00:00
Dylan Smith
dbe4e59555 Change AXIS_end etc. to MAX_AXES
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@168 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-15 11:47:40 +00:00
Dylan Smith
51ead43142 Fix crash where the main loop is blocked and the stick is vigorously waggled
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@167 127b21dd-08f5-0310-b4b7-95ae10353056
2005-10-15 11:38:26 +00:00