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

1837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
8365fc6642 Removed comment that became inaccurate after latest commit, to avoid confusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2286 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 12:59:40 +00:00
Nikos Barkas
8d78dc284a Fixed traders launching from station and immediately returning to dock. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2285 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 10:09:58 +00:00
Eric Walch
fdc84b87aa Completely separated the behaviour_formation_forming_up and behaviour_fly_to_destination. behaviour_formation_forming_up can now accumulate frustration. Restored speed reduction when npc injectors are shut of to the pre SVN 1981 way of behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2284 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-14 09:32:26 +00:00
Marc
8a5fdceed2 * JS ship property setters - improved warnings. 
* removed GNUstep compiler warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2283 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-13 07:55:35 +00:00
Marc
021e398a64 * procedural texturing for planets reset to OFF by default. 
* bugfix: JS system.info.xx & system.infoForSystem([present galaxy],[system number]).xx are readable, as originally intended. infoForSystem now returns null - and a warning - if trying to access any info outside the present galaxy.
* bugfixed the 'nil' javascript delayed crash described in http://aegidian.org/bb/viewtopic.php?p=8271182711 - required extensive code replace.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2282 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-12 23:51:16 +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
Marc
d77ac96f18 * Fines messages now show on screen for longer, and are also silently logged on the comms console. 
* fix: CLASS_NO_DRAW can be used inside plists for specific (ghost?) ships again, as in 1.65 & before. However, system populator still overrides CLASS_NO_DRAW for incoming ships.
* strings tidy up: 'initialising universe' on macs & snapshot filenames on linux & win PCs

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2280 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-10 23:18:47 +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
c537673dc1 scanForOffenders no longer finds group members, Minimum distance player-bouy on system entering raised from 500 to 750 meter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2278 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-09 11:48:38 +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
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