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

1827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikos Barkas
61cf20954d All missiles are now recognized correctly by Oolite. Added Frame's JSStation method dockPlayer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2273 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-03 10:01:09 +00:00
Eric Walch
83c248832a Removed another reason for rare hangs in perfornFaceDestination 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2272 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-01 16:40:26 +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
Nikos Barkas
f7f137a797 Introduced the cloak_passive ship dictionary key. When set to true (or yes), it will cause the cloaking device to be deactivated whenever a main weapon or missile is fired, making the cloak somewhat less of a superweapon. Default is NO. Also removed a check in JS AIState that was causing incorrect error messages to show up. Reverted handling to the 1.72.2 way of setting the state. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2269 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-31 08:04:26 +00:00
Nikos Barkas
fdb050ec22 As per Eric's suggestion in the forum, scripted misjumps have a lifespan of one jump only. After that, auto reset occurs and subsequent jumps become normal ones again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2268 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-28 11:46:44 +00:00
Nikos Barkas
27dc7ece50 Added the JavaScript read/write player ship property scriptedMisjump. Boolean value, player ship jumps will be misjumps as long as this is set to true. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2267 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-27 23:30:58 +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
Jens Ayton
5618f74ef0 Fixed some newly introduced uninitialized pointer variables. Moved internal GuiDisplayGen method declarations into a private category. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2265 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-26 00:23:04 +00:00
Marc
b045eb9f45 bugfix: restored the random numbers sequence as it was before rev.2257 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2264 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-25 14:36:08 +00:00
Marc
975da25bb9 * Status screen: equipment paging part 2: all page switching methods recognised, fixed the double redraw bug from rev.2261 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2263 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-25 10:21:27 +00:00
Eric Walch
25702323da Give populated sunskimmers a minimum heat resistance. Till now none ever survived the skimming. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2262 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-25 09:51:07 +00:00
Marc
a82ca951e1 * Status screen now pages the equipment list - initial implementation. 
* Refactored drawGUI.
* Minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2261 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 22:50:34 +00:00
Nikos Barkas
c639193bbe Fixed bug where planet texture and sky would not be correctly reset on game restart. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2260 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-24 20:39:29 +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
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