Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,960 Commits 1 Branch 0 Tags
Commit Graph

1960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
7842440808 Added a new AI command launchIndependentShipWithRole. Gave sunskimmers heatshielding so they get a chance to jump. Added missile delay to sunskimmerAI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2259 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 19:51:37 +00:00
Marc
8ecc3df6a9 oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2258 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 18:46:16 +00:00
Marc
6fab208475 * sun_radius loop bug: should now cope with all sun_radius values. Plus clamped sun_radius to a min and max value and added 'bad sun settings' warning. 
* updated paging code ('more ->') to be more consistent across screens.
* minor mac code cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2257 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 18:42:53 +00:00
Eric Walch
84bd4b5d90 Added missing () around an equation 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2256 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-22 19:49:40 +00:00
Eric Walch
13cd03aac2 Fixed bug with wrong pendingEscort count. launchTrader now launches traders with correct escorts, also group corrected. Added new slowdown criteria to prevent ships circling around their target. Fixed bug with big defined suns. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2255 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-22 19:15:18 +00:00
Eric Walch
ac423e2d68 Replaced _escortGroup for station launches by a plain _group. This fixes strange behaviour of launching ships. Also added a fix in the slowdown range for ships with low thrust values. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2254 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-19 17:58:08 +00:00
Eric Walch
2dfc1fbe2a Added frustration counter to attack_target_twelve. Changed frustration message for dockingAI.plist. Made trackDestination target area 5% smaller. Replaced fixed system names in mission.plist by Kaks replacement code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2253 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-18 17:57:40 +00:00
Nikos Barkas
631e7f83bd Cosmetic change to previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2252 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-16 21:36:13 +00:00
Nikos Barkas
48a1d88049 Screenshots folder for SDL builds changed to oolite-saves/snapshots, at the same time removing a warning from the previous commit. Also made the left and right square bracket keys recognizable by Oolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2251 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-16 20:49:57 +00:00
Jens Ayton
fd4f58ac77 Last save directory is now saved in prefs; oolite-saves is only created when defaulting to it. Also fixed a leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2250 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-16 12:44:37 +00:00
Marc
9b8d9c47bf New %J token for string expansion: expands %J000 to %J255 to its corresponding system name. graphViz output code updated to include the new token. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2249 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-15 20:59:11 +00:00
Eric Walch
21893abc4c Prevent pauses in ration during final station approach. (less docking crashes). Added Frustration to dockingAI for the benefit of low FPS rates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2248 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-15 18:00:13 +00:00
Eric Walch
6ee4b952a9 Fixed bug with hang in performFaceDestination for non-station ships. Ships owned by the station still suffer from it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2247 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-14 21:32:18 +00:00
Jens Ayton
6b421e7e5e Exclude Oolite logs folder from Time Machine backups. Also, avoid repeated localizations.plurals warnings for same key. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2246 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-14 14:26:17 +00:00
Marc
a632db09ce Renamed planets: %H & %I now use scripted planet names, including inside planet descriptions. See http://aegidian.org/bb/viewtopic.php?t=6091 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2244 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-13 23:44:09 +00:00
Eric Walch
229072362a Wolfpacks are now separate groups again instead of all pirates in one single group. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2243 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-13 15:50:38 +00:00
Nikos Barkas
d61b5a4553 Fixed a 'control has reached end of non-void function' warning from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2241 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-12 21:57:45 +00:00
Marc
44d964ce76 *corrected all planet renaming bugs I could find - see http://aegidian.org/bb/viewtopic.php?t=6091 
*find systems: all possible matches now highlighted while typing!
*Inhabitants names (plural & singular) can now be overridden inside plists.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2240 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-12 20:34:08 +00:00
Nikos Barkas
1e2a77c2d2 Cleaned up comment from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2239 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-12 17:08:57 +00:00
Nikos Barkas
dcd4b5daac Fixed bug where cargo bought from previously remained after a game restart. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2238 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-12 17:03:04 +00:00
Nikos Barkas
0a247bb7fb Moved -drawWatermarkString: to the HeadUpDisplay class, I think it makes more sense being there. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2237 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 18:52:15 +00:00
Eric Walch
651222026e Reworked Aegis messages. sun aegis is recognised, approaching planed event is restored, all handlers have a planet or station as argument. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2236 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 18:51:23 +00:00
Marc
a8ae807a24 Tweak to DESC_PLURAL: it now warns if localization file needs updating. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2235 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 17:59:50 +00:00
Nikos Barkas
722b229202 Added watermark text for the snapshot versions. Currently working on Windows. The idea is to use the snapshot releases for things like nightly builds or distributions of the game other than the official ones. Updated the readme of the Windows version to reflect current project situation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2234 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 16:09:53 +00:00
Marc
36ae491531 bugfix: with undefined 'plural-rules' DESC_PLURAL was returning debug info (i.e. in F7 screen). It does the Right Thing now! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2233 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 15:10:21 +00:00
Nikos Barkas
f4548031bb Fixed crash when max_missiles is set to higher than maximum allowed (16). Modified the Win32 installer to default to the C:\Oolite folder, instead of C:\Program Files\Oolite, hopefully solving the problems with default installation location on Windows Vista. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2232 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-10 14:58:15 +00:00
Eric Walch
5e8d06f38a Fixed bug # 15069 / Multiple missiles at trader no longer reset delay / fightOrFleeHostiles now always gives an answer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2231 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-09 19:56:15 +00:00
Jens Ayton
56b639f5a9 Made randomPauseAI: slightly more idiomatic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2230 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-09 11:37:02 +00:00
Eric Walch
706bb46790 Fixed rare bug in various AI files. Added a randomPauseAI command and added a delay to trader reactions on incoming missiles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2229 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-08 16:20:10 +00:00
Jens Ayton
6fdca737a7 Renabled speech synth under OS X (accidentally broken when ESpeak support was added), minor speech cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2228 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-07 10:26:45 +00:00
Eric Walch
5f8d01a05c AI update for pirates and thargoids 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2225 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-04 22:06:27 +00:00
Nikos Barkas
216bb370b5 Added Frame to contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2224 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-03 20:41:54 +00:00
Nikos Barkas
9309befa43 Commiting Frame's implementation of player.ship.galaxyCoordinates and player.ship.cursorCoordinates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2223 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-03 17:50:53 +00:00
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