3985 Commits

Author SHA1 Message Date
Eric Walch
cf7ed44372 - Launching traders with a 'sunskimmer' role now start with sufficient heat insulation for sunskimming.
- Added an AI command 'checkHeatInsulation' (returns either: INSULATION_OK or INSULATION_POOR)
- ship_temperature no longer becomes negative (and stays negative) after a witchspace jump from a hot area. (delta_t can be several seconds on the first update after a jump)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4647 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-15 19:41:46 +00:00
Eric Walch
77f56e38dd - The random seed is no longer reset when accessing systemInfo other than the current systemInfo. No change in function during initial system setup.
- Some cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4646 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-15 13:30:39 +00:00
Marc
a56ccda6ba - Fix: if galactic drive is damaged while in galactic jump countdown, abort the galactic jump.
- Fix: if player stops a jump countdown, correctly report which type of jump was stopped.

- minor  code cleanuppery, removed surplus player rating calculation.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4645 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-14 23:10:20 +00:00
Michael Werle
6fea51e89d Fix Oolite for gnustep-base without [NSThread isMainThread] implementations.
(Ie, versions before libgnustep-base 1.15.4.  For example, Ubuntu 8.04 LTS still uses libgnustep-base 1.14)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4644 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-12 22:03:35 +00:00
Michael Werle
8b555cba48 Fix main window getting resized to the size of the splash-screen on startup under Linux.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4643 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-11 21:59:55 +00:00
Marc
6a28e5d577 - r4641 redux: no mac compile warnings
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4642 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-08 10:39:38 +00:00
Marc
0840a74968 * Manifest screen fixes:
- removed unnecessary extra blank lines.
  - when all possible types of cargo are in the hold, show alien items quantity on the manifest screen!
  - If more passengers/contracts/missions than can be displayed, show '...' rather than overflowing into the HUD area.

* fix: no passengers / contracts from hacked strict mode savegames.
* fixed a contract_record memleak.
- whitespaces code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4641 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-07 19:30:35 +00:00
Nikos Barkas
ea1ec250ae Oops. Removed forgotten commented out trash from previous commit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4640 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-06 15:47:30 +00:00
Nikos Barkas
aaaf13ad1e Fixed bug where maximum pitch could not be reached when mouse control was used. Requires testing and confirmation that it works as expected. Thanks to Capt. Murphy for the initial bug analysis. Also fixed mouse control for pitch using roll deltas instead of pitch ones.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4639 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-06 15:39:45 +00:00
Eric Walch
3d5dc15f07 The plasma cannon now also uses the 'weapon_position_foo" key from shipdata.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4638 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-05 21:46:48 +00:00
Marc
d1c87b09ec Oops 2! Reset commslog properties on reload / game start.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4637 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-05 20:14:15 +00:00
Marc
e9652da0e0 Oops, too zealous!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4636 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-05 19:22:09 +00:00
Marc
3d01b8e2fc Resizing message_gui & comms_log_gui via hud.plists now retains comms log & last 2 message lines...
Improving the fix would likely require massive refactoring of GuiDisplayGen, with repercussions across the whole game. Further code tweaks postponed to after MNSR.

 - also minor cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4635 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-05 18:24:48 +00:00
Marc
7593ee4c22 Revisited recent fixes:
- rev4632 redux: improved isValid fix - shouldn't have any side effects now.
 - rev4623 redux: code cleanup, and entities that spawn alloys/scrap metal will still do so when closer to a full universe.

tentative fix: shipScoopedOther() should now fire properly for every scooped event, not just for scripted targets. NB: fix to be rolled back if not working properly. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4634 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-04 17:37:32 +00:00
Eric Walch
91a0c79cbd An aft mounted NPC plasma cannon was firing forwards. The aft mounted npc plasma cannon now fires correctly backwards from the backside. (For the player the direction was always correct)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4633 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-29 14:12:22 +00:00
Marc
6a825ad8eb - js fix: during the game tick while they're being destroyed, isValid would return true for STATUS_DEAD entities, but all other js properties would not be valid. isValid now returns false in this case.
- preview! cargoScooped() - js event to be added after MNSR.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4632 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-25 17:21:12 +00:00
Michael Werle
be1ed636a0 Fix snapshots for odd-sized fullscreen modes.
- Also reverted forcing windows to 4-pixel size as the new snapshot code does not seem to require this.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4631 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-24 21:28:30 +00:00
Michael Werle
e70597a789 Fix Linux SDL full-screen mode for odd resolutions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4630 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-23 21:22:50 +00:00
Eric Walch
4665353ee8 Changed 'dealEnergyDamageWithinDesiredRange' so that the damage is now independent of the size of the target. The damage against a Cobra III stays the same as before.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4629 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-23 18:05:23 +00:00
Eric Walch
776b1964e3 - Added fix to prevent docking ships getting far away holding positions
- Prevent a freeze when a worldScript tries to resurrects the player on dying because of an energy blast. (same fix as in shipEntity, r4624)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4628 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-23 13:38:47 +00:00
Marc
de371c4fa9 r4624 redux: identical death behaviour when the universe is full!
- plus some whitespaces cleanup, and a post-MNSR TODO comment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4627 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-20 18:17:53 +00:00
Nikos Barkas
8058240dc0 Fixed HUD on/off toggle key shown in Reference Sheet to correspond to what we have from 1.75 onwards.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4626 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-19 14:01:14 +00:00
Nikos Barkas
2bc085b4d0 Fixed key_map_home assignment so that it corresponds to the correct Home key code.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4625 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-19 13:17:01 +00:00
Eric Walch
9d7190f966 Prevent a freeze when a ship script tries to resurrects a ship on dying because of an energy blast (Bug #18054). Ship now will just die.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4624 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-18 19:58:37 +00:00
Marc
45d6c56bad * UNIVERSE full fixes:
- Simpler explosion effect when universe is full
 - Entities that spawn alloys/scrap metal will still do so without exceeding entities limits.
 - system.addShip() & .addGroup() - only ships actually added to the universe are added to the returned array. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4623 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-17 15:17:33 +00:00
Eric Walch
3db424c845 The dumping of the entity list when the universe is full can now be controlled through the logcontrol.plist. Default is no dumping.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4622 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-17 14:25:20 +00:00
Marc
1968e30e2c Fixed bug #18055 : Pending message overflow for thargoids, -> crash
A fuller message is printed on the log, the last AI message is discarded instead of joining the deferred messages stack, and Oolite carries on, rather than crashing horribly.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4621 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 21:17:34 +00:00
Eric Walch
e54d7a5c82 - Fixed one compiler error for deployment
- Commented out code that tried adding exploding subentities twice to the universe.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4620 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 20:42:54 +00:00
Marc
da467416c3 - Fixed a glitch between intro1 & intro2 that became apparent after previous fix.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4619 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 18:28:49 +00:00
Marc
704e541005 - suppressing clang stuff...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4618 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 13:54:33 +00:00
Marc
b2e41a0306 * 2 deployment fixes:
- '*' creates a snapshot, as per 1.65 - fixed SDL inconsistency, so numpad '*' also works.
 - 'o' switches the HUD on & off - its js equivalent also works. Inexplicably that key was left hardcoded while all other keys were moved to keyconfig.plist - fixed that too.
* hopefully finished fixing windows' UK keymapping.
* fixed intro inconsistency between game startup, and restart (now the cobra 3 caption shows for exactly the same amount of time in both cases).
* Fixed minor autosave glitch - no more unnecessary autosaves immediately after saving a game manually.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4617 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-14 13:49:27 +00:00
Michael Werle
af2e1ad31e Bugfix: fix vertical bar keycode for SDL builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4616 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-11 21:55:44 +00:00
Jens Ayton
30cdb0033b Compatibility fix for Mac OS X 10.4 targets.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4615 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-08 11:25:27 +00:00
Eric Walch
22ab6c69a6 Firing the npc aft-laser, no longer triggers the forward shooting subEntity lasers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4614 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-07 12:11:23 +00:00
Eric Walch
f111b2080d dealEnergyDamageWithinDesiredRange new does weapon_damage to a ship when called from inside the collision range. Was zero damage inside the collision range.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4613 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-04 13:13:37 +00:00
Nikos Barkas
68889d1253 Hopefully fixed crashes with spoken messages on builds using libespeak.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4612 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-03 09:56:18 +00:00
Eric Walch
bb0a795fe7 Fixed a problem of the JS command 'rotationTo' returning an illegal quaternion for some anti-parallel vectors
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4611 127b21dd-08f5-0310-b4b7-95ae10353056
2011-10-02 08:49:03 +00:00
Eric Walch
73079a255d The JS method angleTo sometimes returned a NaN for identical vectors instead of zero because of rounding errors. Fixed now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4610 127b21dd-08f5-0310-b4b7-95ae10353056
2011-09-28 12:44:57 +00:00
Marc
ca7d7831e3 No more double spaces inside randomly generated planet descriptions (see http://aegidian.org/bb/viewtopic.php?f=3&t=10912 )
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4609 127b21dd-08f5-0310-b4b7-95ae10353056
2011-09-27 15:37:56 +00:00
Marc
e9051c50b7 - 'sticky' sounds now stop after death & loading a commander, as well as after a restart. should finally fix bug #18108 ( Sounds keep playing after a reset ).
- reworded a comment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4608 127b21dd-08f5-0310-b4b7-95ae10353056
2011-09-19 13:05:42 +00:00
Eric Walch
e6661259e3 The totalBoundingBox of the player was never calculated. But, now this box is used to line up for a docking port, it must be updated like all npc ships.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4607 127b21dd-08f5-0310-b4b7-95ae10353056
2011-09-03 12:06:42 +00:00
Nikos Barkas
156dce6f92 Fixed inconsistency of mission screens' choices not being selectable by mouse.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4606 127b21dd-08f5-0310-b4b7-95ae10353056
2011-09-02 10:19:06 +00:00
Eric Walch
14d26c0a07 The anticipating missile tracking for accuracies > 0 now only will do its job when pursuing a target and not when flying head-on towards the target.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4605 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-27 20:21:28 +00:00
Eric Walch
8ba93d4115 - The AI commands 'becomeExplosion' and 'becomeEnergyBlast' now also trigger the shipDied event handler.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4604 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-26 19:34:19 +00:00
Eric Walch
82a5224fb7 - With i-tunes integration on, i-tunes now stays quiet on startup and the normal oolite theme is played instead.
- Switching i-tunes integration off in the games preferences, now pauses i-tunes.
- The docking computer now plays  "BlueDanube" as looped music so that it no longer ends on long dockings.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4603 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-22 14:25:21 +00:00
Jens Ayton
eb546103d7 Attempted fix for wrong iTunes playlist after startup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4602 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-22 10:43:10 +00:00
Eric Walch
26bc5f9ada Ships in the shipyard are no longer shown with incompatible equipment, or equipment with missing dependencies.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4601 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-20 12:45:18 +00:00
Nikos Barkas
063427c16e Fixed weapon name displayed always as '<position> <type> laser' on the status screen, even after editing it in equipment.plist. As a result, the weapon_name array in descriptions.plist is no longer necessary.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4600 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-19 22:53:46 +00:00
Eric Walch
b7e3c6089e Removed some validation checks for internal awardEquipment commands.
- setEquipmentStatus now no longer removes the equipment when conditions fail.
- Equipment with a 'requires_not_clean' condition is no longer removed on loading a game.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4599 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-19 09:31:26 +00:00
Eric Walch
1ea9321543 equipment, damaged in combat is now replaced by a damaged version without a validation of conditions. The player already had it, so no need for testing with the risk that it is removed entirely.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4598 127b21dd-08f5-0310-b4b7-95ae10353056
2011-08-17 07:13:12 +00:00