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

435 Commits

Author SHA1 Message Date
Jens Ayton
9781d2b9d1 Fixed possible but unlikely cause of crashes in JavaScript error handling, and improved log message classes for JS errors (symbolic names instead of magic numbers). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2308 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 20:49:25 +00:00
Jens Ayton
6a9c1ff4e8 Updated whitelisting mechanism to allow both world script actions and AI actions in the following script types: ship actions (called through JS ship.runLegacyShipActions), rescued character scripts, scriptActionOnTarget:/safeScriptActionOnTarget:. System script_actions are restricted to world script actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2304 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-23 16:16:54 +00:00
Eric Walch
87a4359592 Added setStateMachine: to the whitelist as alias of setAITo: 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2296 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-20 09:23:41 +00:00
Nikos Barkas
b1ecf44f55 Removed escorts=4 declaration from boa-mk2-player. This should stop some ship.escortSetup.wtf errors popping up in the shipyard screen. Thanks to Svengali for spotting it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2287 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 21:24:41 +00:00
Nikos Barkas
d327b41c73 Fixed HUD speed bar not drawing correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2281 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-11 15:07:41 +00:00
Nikos Barkas
777f99046b Changed default cloak_indicator_on_status_light in to NO, as it was initially meant to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2279 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-09 16:22:40 +00:00
Eric Walch
318b208ab6 Added 2 missing keys for verifyOXP 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2277 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-08 12:41:23 +00:00
Eric Walch
b585e1d0ed Added a JS method for player: addMessageToArrivalReport(message). Added a eventhandler that fires after the last arrivalReportScreen is shown. Changed the internal missions so they no longer overwrite this report. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2276 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-06 20:24:25 +00:00
Marc
187dc2687f * repositioned message row, and reworked status screen. Messages now fully readable in standard Oolite. 
* if a message is repeated after 6 seconds, it will now show again, otherwise it's ignored as before.
* game settings screen: mac fullscreen resolution changes are now immediate, and F12 changes in SDL give immediate feedback.
* some minor code optimisations & cosmetic changes, including a mac splashscreen string.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2275 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-04 01:46:53 +00:00
Eric Walch
900e439603 Limited checkcourseToDestination to scanner range so it only changes course when it actually "sees" something. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2274 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-03 17:11:24 +00:00
Eric Walch
fb4f1d6690 Added AI command "setSpeedToCruiseSpeed". Populator no longer changes AI for ships with auto_ai is false. Bounty for script added pirates and traders follow now populator rules when auto_ai is true. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2271 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-01 11:56:30 +00:00
Eric Walch
47cbf22071 patrol-ships no longer patrol the mainStation area but the area around the launching station. Re-added Xeer as hard coded text at two places were it refers to Xeer from G2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2270 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-31 09:34:51 +00:00
Eric Walch
758a6d0b1c Added a checkOwnLegalStatus command and used it for a career selection for escorts. Added a playerBoughtNewShip eventhandler. Hardcoded Xeer back in missiontext were it revers to the previous galaxy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2266 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-26 11:20:42 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
add5b672d4 Combine two message pairs into single messages. This tidies up speech a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2155 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-01 15:11:46 +00:00
Darren Salt
8443bf9cb6 Voice type selection for use with espeak. 
The "espeak-default-voice" description key sets the default type.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2153 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-30 20:55:09 +00:00
Nikos Barkas
7059e171e3 Fixed debug console crash on WinXP. Should work without problems on Linux and Vista too, please check. Increased Wormhole Scanner price to 2395Cr. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2143 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 16:05:49 +00:00
Nikos Barkas
a8c42528b2 Fixed a capitalization error in previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2137 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:59:56 +00:00
Nikos Barkas
e1cf86812a Commited Eric's updated nova mission script and added the nova_coward mission text. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2136 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:51:50 +00:00
Nikos Barkas
fc462e2e9f Commited a preliminary version of Eric's update to the Nova mission. The witchspace buoy now sends distress call messages when in the vicinity of the player, if current system is going nova. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2134 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-20 22:35:54 +00:00
Nikos Barkas
b0c7b0dbfd Hopefully fixed a memory mismanagement situation that resulted in occasional crashes related to planet textures. Increased just a tad the default corona flare for enhanced prettiness. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2126 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-10 15:35:49 +00:00
Michael Werle
e0344e1d54 Wormholes: 
* Enable by default in GNUmakefile
* Adjust price to something more plausible
* Fix discrepancy in save-files between loading & saving

SDL Sound:
* Commit in sound patch when no sound-card available (was committed into 1.72 ages ago)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2124 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-08 22:36:37 +00:00
cmdrjames
fc710b9b1a Finally commit a change to heat handling after seeing a comment from micha about it (was discussed on forum a few weeks ago) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2121 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-05 15:05:11 +00:00
Nikos Barkas
196e813089 More improvements in for the Wormhole Scanner. Details like destination, ETA to destination and time before wormhole collapsing appear on the targetting reticle area as well. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2119 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-04 00:20:49 +00:00
Michael Werle
d7578e4f36 Wormholes: 
* Added code to add wormhole to scanned wormholes (was omitted in r2111) without which persistent wormholes doesn't work. Oops.
* Added delayed decoding of information from scanner - data added to the communications log
* Upped tech level to 9

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2118 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-03 22:41:03 +00:00
Nikos Barkas
71cc6e6e2b Switched hud.plist to OpenStep format and added example of drawing a yaw indicator bar (disabled by default - comment out relevant lines to enable). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2117 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-02 21:57:34 +00:00
Michael Werle
360e502c40 First draft of the Wormhole Scanner 
To test: define WORMHOLE_SCANNER preprocessor macro (see GNUmakefile), by default off.

TODO: 
 * Restore wormhole if not expired and in current system
 * Draw Wormhole exit effects
 * Revise techlevel, price, description
 * bugs?



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2111 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 01:12:24 +00:00
Michael Werle
eb223d5784 * Revamped targetting system as discussed in http://www.aegidian.org/bb/viewtopic.php?t=5921 
* Added logging of compile-time options


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2106 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-28 00:42:48 +00:00
Marc
5b55c9bea1 Bugfix/update: customSounds tokens (e.g. [@boop]) can now be arrays too. Resolved some dangling inheritances inside logcontrol.plist & updated a couple of errors & warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2104 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-26 14:12:35 +00:00
Marc
6a2fca0aeb Planet refactoring II: textured planets now show up in system data screen. System data screen better optimised. Prices inside the gui are now either padded(goods market), or right aligned (equipment, shipyard, passenger/carrier market) - minor adjustment to carrier market premium. All in-flight screens now switch to forward view when starting hyperspace jumps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2102 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-25 03:57:38 +00:00
Jens Ayton
5dac3c459e Reload speech stuff when changing game modes on all platforms; avoid exception due to mutating escort list while iterating it; made legalStatus_number alias of commanderLegalStatus_number (implementations were identical). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2098 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-20 15:27:56 +00:00
cmdrjames
8ac6b1dd3c better docking AI from Eric Walch 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2097 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-18 00:42:56 +00:00
cmdrjames
47213c7a5e fix for pirate cove defense-ships not working 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2096 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-18 00:39:57 +00:00
Jens Ayton
886bfccbab Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-15 16:14:03 +00:00