Jens Ayton
|
b40fbf2871
|
Fixed invalid enumerant error in octree debug drawing introduced in r1508. Tweaks to distanceMap tool.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2222 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-07-03 09:54:20 +00:00 |
|
Jens Ayton
|
a7469b97c5
|
Fixed JS Ship.escorts returning ship itself. Suppressed error spew when a sound can't be resolved.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2221 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-07-03 09:20:13 +00:00 |
|
Nikos Barkas
|
4c3ce7cfef
|
Bugfix to requestDockingCoordinates, as proposed by Eric: Check that station is less than 2.5 times scanner distance from ship requesting coordinates. This avoids some cases of escorts getting stuck in dockingAI when just outside the station aegis.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2220 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-30 22:09:42 +00:00 |
|
Jens Ayton
|
d950757ccb
|
Exposed abortAllDockings and throwSparks (or more precisely, setThrowSparks:YES via a shim aliased as throwSparks) to AI. Fixed a typo in an error message.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2219 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-24 21:59:00 +00:00 |
|
Jens Ayton
|
0285f07250
|
requires_equipment, requires_any_equipment and incompatible_with_equipment restrictions now work for weapons.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2218 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-21 13:27:07 +00:00 |
|
Jens Ayton
|
106fbe6ea6
|
JS PlayerShip.removeEquipment() now works for missiles. Also, awardEquipment()ing a missile when the player has none now causes the new missile to be selected.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2217 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-21 13:18:54 +00:00 |
|
Jens Ayton
|
5c52303826
|
Added -[ShipEntity hasEquipmentItem:includeWeapons:]; hasEquipmentItem: is now a shortcut fot hasEquipmentItem:foo includeWeapons:NO. Moved JS hasEquipment() from PlayerShip to Ship and made it include weapons by default, with optional argument to suppress this.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2216 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-21 12:35:37 +00:00 |
|
Nikos Barkas
|
4cecd6db0a
|
Fixed submunitions awarding kills when destroyed by same owner submunitions. Better variable naming for the -nearestEntityMatchingPredicate: earlier fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2215 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-19 19:13:25 +00:00 |
|
Nikos Barkas
|
e8cd76db70
|
Fixed -nearestEntityMatchingPredicate: so that it actually returns the entity nearest to the reference one.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2214 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-17 21:25:12 +00:00 |
|
Nikos Barkas
|
0b6a9d5dec
|
Fixed Torus Jump Drive. Bug #15871 is good to close, I believe.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2213 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-17 18:04:06 +00:00 |
|
Nikos Barkas
|
db6e13105f
|
Fixed fuel injectors.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2212 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-17 17:45:47 +00:00 |
|
Nikos Barkas
|
3af308599d
|
Get docking AI to process the NO_STATION_FOUND message. This avoids situations where ships get stuck in the AWAIT_COORDS state, if a station to receive coordinates from cannot be found.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2211 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-17 17:23:40 +00:00 |
|
Jens Ayton
|
0106b5257f
|
Flight speed is now clamped for all inpout methods and unified to a single source location.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2210 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-16 23:42:33 +00:00 |
|
Jens Ayton
|
836c070785
|
Fixed hasShipyard.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2209 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-16 06:43:29 +00:00 |
|
Jens Ayton
|
d4b7f42c08
|
Changed oolite.bug.reports@gmail.com to bugs@oolite.org as appropriate.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2206 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-14 19:22:31 +00:00 |
|
Nikos Barkas
|
cf0b118a56
|
Detect a rare error when calculating trade in value for a ship in the shipyard screen. If the ship for which we are calculating trade in value does not have a corresponding dictionary entry in shipyard.plist, report the error and set its price to 0. This avoids huge trade in values showing up.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2202 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-13 16:02:21 +00:00 |
|
Jens Ayton
|
51b1d50a9b
|
Stylistic cleanup: YES and NO, not true and false. Yeah, it's odd, but it's consistent.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2201 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-13 14:41:36 +00:00 |
|
Nikos Barkas
|
808e3c79a8
|
More docking computer fixes. Hopefully fixed the bug where stations were sometimes being targeted at huge distances.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2200 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-10 16:48:12 +00:00 |
|
Nikos Barkas
|
f5e9eaa1c4
|
Fixed bug where main system station was not set upon autopilot activation, resulting in nearest station being always selected for autodocking.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2199 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-09 10:25:30 +00:00 |
|
Nikos Barkas
|
b9f4c14684
|
Improvements to dockingAI.plist, as provided by Eric. This should stop ships getting stuck in BEHAVIOUR_FACE_DESTINATION and ensure that ships respond to attacks properly when docking.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2198 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-08 21:39:37 +00:00 |
|
Nikos Barkas
|
c29d19216b
|
Fixed some trade in information display problems with the shipyard screen. When a ship has way too many extras and it overflows the sales pitch allocated space, no attempt to display trade in info is made.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2197 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-08 16:41:47 +00:00 |
|
Nikos Barkas
|
8656cc25b6
|
Disabled for now the auto_ai bounty assigning code for pirates, I think it has some side effects that need to be investigated further.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2196 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-04 18:24:12 +00:00 |
|
Nikos Barkas
|
b7868e42a7
|
Nova mission related improvements. Fixed crash viewing F7 screen and a different aegis related crash when in a system gone nova. Aegis crash bypassed by disabling compass in nova systems for now. Made government, inhabitants and economy strings for nova systems user modifiable. Finally, added bounties for pirates generated with auto_ai set to YES.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2195 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-04 18:01:05 +00:00 |
|
Nikos Barkas
|
c789685960
|
Fixed incorrect nova system name displayed in planet info description.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2194 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-04 06:25:44 +00:00 |
|
Nikos Barkas
|
544f866155
|
Fixed offender distress calls being accepted by police, stations and hunters. See bug description at http://www.aegidian.org/bb/viewtopic.php?t=6195
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2193 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-02 21:36:49 +00:00 |
|
Nikos Barkas
|
42bbeefd71
|
Removed debug flag DEBUG_SLOW_MODE, it is not needed now that we have TAF. Debug flag DEBUG_NO_DUST value changed from 0x800 to 0x400. Got rid of TAF magic numbers in the code.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2192 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-02 16:06:23 +00:00 |
|
Darren Salt
|
212da8ad7c
|
Bump the limit on gold, platinum & gemstones to 10000 units.
Seems that contracts for transport of ≥1000 units can be generated.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2191 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-02 15:42:00 +00:00 |
|
Nikos Barkas
|
af1002f407
|
Fixed a couple of potential problems where return was used inside NS_DURING blocks instead of NS_VALUERETURN.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2190 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-06-02 13:54:20 +00:00 |
|
cmdrjames
|
a8398dddd9
|
Change to subentity drawing as suggested http://www.aegidian.org/bb/viewtopic.php?t=6128&start=15
This brings into line with the subentity code in ShipEntity.m
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2189 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-30 19:35:10 +00:00 |
|
Nikos Barkas
|
03900e7865
|
Slightly improvement to previous commit. Changed method isMissileFlag to isMissileFlagSet to make code a bit more understandable.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2188 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-28 20:56:16 +00:00 |
|
Nikos Barkas
|
fc0cdfae2d
|
Fixed submunitions fired by player not having a target and an owner. Thanks to Eric for his analysis leading to the fix. Also brought back the message 'Missiles on Safety', which seems to have disappeared as a result of a recent refactoring.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2187 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-28 20:05:28 +00:00 |
|
Nikos Barkas
|
4fbde7c793
|
Fixed bug where throw_sparks would not be reset when a ship entity was created anew. Now throw_sparks is set up according to the shipdata.plist key throw_sparks and defaults to NO if such key is not specified.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2186 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-28 14:31:20 +00:00 |
|
Nikos Barkas
|
6cc1fe5117
|
Bugfix: Do not change time acceleration if the user has paused the game in-flight and is trying to adjust game options that require usage of arrow keys.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2185 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-27 16:39:51 +00:00 |
|
Nikos Barkas
|
8601602f49
|
Added the Acrobat PDF version of Advice for New Commanders and made the Windows installer install this in the root Oolite folder.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2184 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-25 10:11:20 +00:00 |
|
Nikos Barkas
|
670033224f
|
Commited the MS Word version of Advice for New Commanders by Disembodied. Hopefully it will be included in the distribution soon.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2183 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-24 18:51:57 +00:00 |
|
Jens Ayton
|
1feeb63fd8
|
Ran all game scripts through JSLint (http://www.jslint.com/), but not console script because it's full of JavaScript 2-isms. The JavaScript 2 that isn't going to happen. Yay.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2182 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-22 22:45:02 +00:00 |
|
Nikos Barkas
|
2a4ff27ad1
|
New feature: Time Acceleration Factor. Activated while in pause mode with left and right arrow keys. Can be from 1/16 to 16 times the normal time. Also controllable by JavaScript using the read/write timeAccelerationFactor global property for bullet-time-like effects. TAF is visible in the FPS display.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2181 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-20 12:41:15 +00:00 |
|
Nikos Barkas
|
688d186508
|
Made incoming missile targeting a default build option. A clean project rebuild is recommended.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2180 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-19 07:59:20 +00:00 |
|
Nikos Barkas
|
341ddcfd98
|
When the player enters a wormhole, Oolite now remembers the player's originally selected destination, as it could be different to the wormhole's one.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2179 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-17 10:28:39 +00:00 |
|
Nikos Barkas
|
4e9cb8dbc6
|
Fix for Berlios bug #15688 (Mother attacking its own escort): Clean mothers can now only accept clean escorts.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2178 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-14 22:35:52 +00:00 |
|
Nikos Barkas
|
686bdef0a2
|
Fixed a bug where the mission screen background would remain after a scripted launch of the player ship before the normal end of mission screen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2177 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-12 16:21:42 +00:00 |
|
cmdrjames
|
7e7430883e
|
minor fix for xcode warning
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2176 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-10 15:31:53 +00:00 |
|
Nikos Barkas
|
9fdf492a87
|
Better fix for escort ship circular references, as proposed by Eric. The fix is that escorts cannot have escorts of their own anymore. This avoids memory overflows in cases of recursive escort-ship, escort-role and mutual escort ship references between two or more ships.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2175 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-10 13:38:31 +00:00 |
|
Nikos Barkas
|
7b46becefc
|
Fixed memory overflow that was happening when a ship dictionary contained an escort-ship key of the same name as the dictionary key of the mother ship (e.g. boa-mk2 attempting to generate 4 boa-mk2 escorts).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2174 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-09 14:48:30 +00:00 |
|
Darren Salt
|
1f2c2111f5
|
Plural handling for languages with more than one plural form.
For documentation, see Resources/Config/descriptions.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2173 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-08 17:43:11 +00:00 |
|
Darren Salt
|
f2efe5fbec
|
Add some extra info to debian/control; add debian/copyright.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2171 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-07 22:44:17 +00:00 |
|
Darren Salt
|
07ef0e42d6
|
Fix handling of oolite.dbg when building .debs with DEB_BUILD_OPTIONS=noopt.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2170 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-07 22:08:21 +00:00 |
|
Darren Salt
|
b65a385115
|
Remove obj{,.spk}{,.dbg} in the "clean" target.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2169 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-07 22:07:07 +00:00 |
|
Darren Salt
|
05120ef44c
|
Have functions for determining sort order return NSComparisonResult, not int.
Remove the corresponding Debian-specific patch, which only partially addressed
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2168 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-07 21:22:17 +00:00 |
|
Darren Salt
|
43cf6cfb58
|
Set Terminal=false in the .desktop file.
Remove the corresponding Debian-specific patch.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2167 127b21dd-08f5-0310-b4b7-95ae10353056
|
2009-05-07 21:09:59 +00:00 |
|