417 Commits

Author SHA1 Message Date
Giles Williams
15834f0b46 fixup docking routines again and add two new utility AIs (part of large vessel adaptations
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@606 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-23 12:16:14 +00:00
Giles Williams
715de84b12 improvements to docking subroutines
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@605 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-23 10:19:27 +00:00
Giles Williams
a3036fea3d clean up and drop debugging messages
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@604 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-22 10:09:59 +00:00
Giles Williams
39c31b6381 now will launch multiple escape pods if "has_escape_pod" is > 1
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@603 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-22 10:07:22 +00:00
Giles Williams
26828f6cd1 added launchShipWithRole:
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@602 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-22 10:06:38 +00:00
Giles Williams
a563682d2c gray out passengers and cargo you cannot take
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@601 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-21 10:10:19 +00:00
Giles Williams
337dd332b5 new routine: BOOL setFirstSelectableRow
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@600 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-21 10:09:56 +00:00
Giles Williams
2f069e02b0 if multiple changes are made to the linked lists only check their integrity once per update
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@599 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-21 09:13:30 +00:00
Giles Williams
da35bd5955 improvements to handling and maintaining xyz linked lists
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@598 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-20 12:42:58 +00:00
Giles Williams
785096ed67 when launching escape pod check for <key>escape_pod_model</key><string>custom_pod</string> if it exists then use it instead of "escape-capsule"
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@597 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 22:47:27 +00:00
Giles Williams
9b026c338b no zombies permitted - prevent entering space dock when you are dead
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@596 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 18:16:11 +00:00
Giles Williams
cfc115a9a0 ignore blank lines in .mtl file
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@595 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 14:56:05 +00:00
Giles Williams
f670ea4f42 show smoothing groups in the output file by varying the red value of a face - v1.65b4 will show these smoothed patches if the shipdata entry specifies smoothed true
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@594 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 13:48:59 +00:00
Giles Williams
e32d2998cc allow models with a mixture of 'smoothed' and 'hard' vertices by considering the red colour value of a face to indicate its smoothing group
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@593 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 13:44:17 +00:00
Giles Williams
2721d28c05 better handling of whitespace, handles negative vertex references in face lines
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@591 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 11:56:25 +00:00
Giles Williams
aded61b305 changes avoiding enter key repeat problems in mission choices
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@590 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-19 09:31:48 +00:00
Giles Williams
8f35abf10b replace percent symbol with text
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@589 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-17 08:43:50 +00:00
Giles Williams
98d24ad127 cloaking device portable between ships
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@588 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-17 08:43:10 +00:00
Giles Williams
bc86e9b101 debugging options while paused: 'b' for collision debug 'c' for octree debug 'd' for full debug '0' for object dump and debug off
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@586 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-15 18:06:27 +00:00
Giles Williams
824acb6656 laser collision code tidy up and bug fix
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@585 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-15 12:38:38 +00:00
Giles Williams
7890dc7098 better handling of jumping between systems that share coordinates (requires witch-fuel, but costs none)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@584 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-15 09:03:55 +00:00
Giles Williams
564381b223 bullet proofing against bad calls
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@583 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-15 08:57:43 +00:00
Giles Williams
a249204ce6 one more fix to cloaking device
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@582 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-14 06:44:48 +00:00
Giles Williams
61fd32fe75 fixes US cloaking device
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@581 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-14 06:23:36 +00:00
Giles Williams
b65829af14 don't change to an external view if pressing 'v' while in a gui screen accepting input
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@580 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-13 20:22:42 +00:00
Giles Williams
052f618b61 overthinking it! - better portUpVector code here
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@579 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-13 16:08:23 +00:00
Giles Williams
1b207a7514 adjust docking orientation according to BOTH port dimensions and ship dimensions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@578 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-13 15:10:59 +00:00
Giles Williams
0704befc1c fixed octree collision code - looked like the problem was not interpreting subentity positions and orientations properly
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@577 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-13 10:22:10 +00:00
Giles Williams
7b691afce4 tidying up
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@576 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-13 10:21:02 +00:00
Giles Williams
6a9bd40d6e fixed up last commit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@575 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 22:07:03 +00:00
Giles Williams
a47818c1fc cracked showing particles from any viewpoint
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@574 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 21:55:08 +00:00
Giles Williams
6a614a1082 true custom view-ports for ships almost completely implemented - some fixes to ParticleEntity.m draw routines still necessary.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@573 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 18:04:15 +00:00
Giles Williams
f80d8c4158 show collision effects on subentities if DEBUG_OCTREE is true
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@572 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 16:24:43 +00:00
Giles Williams
ac540b38cf minor clean ups
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@571 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 16:23:44 +00:00
Giles Williams
41fd95ee8d normalise quaternions before making gl_matrices
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@570 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 16:23:05 +00:00
Giles Williams
179576b088 minor changes/improvements
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@569 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 16:22:15 +00:00
Giles Williams
bf719b3226 ensure quaternions read from strings are normalised
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@568 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-12 16:21:10 +00:00
Giles Williams
ce9cd4611b better handling of when cargo contracts are short of a barrel or two
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@567 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-10 21:44:05 +00:00
Giles Williams
6f6992763a WIP commit
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@566 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-09 19:32:39 +00:00
Giles Williams
591ce7f27f debugging revisions to how octrees are tested
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@565 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-09 10:32:59 +00:00
Giles Williams
cd1ff3abbb store octrees using relative references to subtrees (permits using subtrees independently)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@564 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-09 08:50:50 +00:00
Giles Williams
30827cb193 check oolite version versus version of saved cache (permits changes between versions).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@563 127b21dd-08f5-0310-b4b7-95ae10353056
2006-06-09 08:45:33 +00:00
Giles Williams
d3aedd1f35 load the cache from the appropriate path for the OS
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@562 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-25 21:36:59 +00:00
Giles Williams
4a2060e6c0 moving to xcode 2.3
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@561 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-25 21:36:31 +00:00
Giles Williams
00a74dea08 collision debugging work
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@560 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-25 08:57:25 +00:00
Giles Williams
d5b52b3cc7 minor cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@559 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-25 08:53:30 +00:00
Giles Williams
2c2e9ee23a mostly eliminating previous scanning bugs by re-using existing linked-lists
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@558 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-16 18:17:28 +00:00
Jens Ayton
092bd47483 Cleaner implementation of FourCharCodeToNSString().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@557 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-16 17:24:41 +00:00
Giles Williams
f2569a38d5 fix problems expanding phrases like '[d100_number]'
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@556 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-15 08:59:24 +00:00
dajt
764610cca8 Added playSound script action.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@552 127b21dd-08f5-0310-b4b7-95ae10353056
2006-05-13 10:16:36 +00:00