3906 Commits

Author SHA1 Message Date
Marc
35f3a46c2c made 'make -f Makefile clean' less destructive under minGW, removed some redundant redundancy
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4669 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-29 20:20:51 +00:00
Marc
d6d4accdc8 The first attempt to start a witchjump after a galactic jump would abort. Should be fixed now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4668 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-29 03:34:00 +00:00
Marc
63555f1812 rev4665 regression: fixed inconsistent state at startup when in windowed mode.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4667 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-28 15:25:51 +00:00
Marc
5be470ff88 Debug OXP fix: debug-only callObjC() function was made enumerable when disabled(!), it's now non-enumerable in all cases as God intended.
NB: of course, Debug OXP inside AddOns needs to be updated!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4666 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-28 14:11:59 +00:00
Marc
d2922e78d4 More js reset fixes:
- made js engine less likely to stall on reset after player's death.
 - better feedback in case of load game failure due to js issues.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4665 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-28 01:17:03 +00:00
Marc
47786d1f79 - fix: in debug mode, Oolite would occasionally CTD after non-fatal linkedlist errors.
- fix: only call frameCallBacks when game is actually running.
- fix: js reset problems should not stall/crash the game anymore. Kept test harness (#if 0-ed) for further tests.
- yep, some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4664 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-27 12:42:09 +00:00
Marc
f44dede98e Pause & autopilot fixes:
- Unless explicitly in normal flight or docked, the game actively unpauses itself. This fixes 'frozen' pause mode when in witchspace tunnels.
 - Pause buttons weren't working when using the autopilot. Fixed.
 - Regression fix: pressing 'fast dock' while on autopilot stops the autopilot, as before.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4663 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-23 11:56:15 +00:00
Eric Walch
ca2205ff57 Set 'velocity' to zero on leaving witchspace.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4662 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-23 08:19:21 +00:00
Nikos Barkas
3567fdc57d Fixed inconsistency where fuel price displayed was not actual price being paid for ships with fuel charge rate other than 1.0.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4661 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-22 15:02:04 +00:00
Marc
7593be7f0c Still no nova info fix, faster cache build time, plus whitespaces cleanup!
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4660 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-21 20:28:21 +00:00
Marc
c1f80b0581 Fix: stopped short range chart i from displaying erroneous pre-nova data for nova systems.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4659 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-21 20:17:01 +00:00
Marc
779c3de34d - fix: after loading a game, .startUp() fires up after the galaxy is properly initialised.
- fix: changes to system.name, system.techLevel, etc. are now shown correctly on the short range map.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4658 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-21 16:19:04 +00:00
Michael Werle
5212c2ace4 Fix 0-price equipment freeze.
http://aegidian.org/bb/viewtopic.php?f=3&t=11217

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4657 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-21 12:33:50 +00:00
Marc
47ecd488b4 Fix: restarting the game from paused didn't reset the ship's speed.
- clarified a log message.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4656 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-20 07:03:20 +00:00
Eric Walch
e334d0c798 - Added code to prevent that thargons become part of an escort group.
- Added CLASS_MINE to the oxpVerifier.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4655 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-19 10:01:59 +00:00
Marc
ba98335ef6 No more assertion failures for huge thargon escort groups.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4654 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-18 02:13:53 +00:00
Eric Walch
35ac9b3239 - Fixed bug in the oxp-Verifyer not recognizing 'escorts' in shipdata.
- energy now won't get negative on long update intervals with active cloak. e.g. on exiting a wormhole.
 (should probably fully switched of during jumping)
- ported player inactive cloak behavior to npc cloak.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4653 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-17 17:27:04 +00:00
Marc
f94f13904f JS groups fixes part I:
- added some checks when trying to add an escort to a ship via .escortGroup.addShip() - much more testing needed.
 - better handling of thargoid edge cases than rev4649

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4652 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-17 13:46:28 +00:00
Marc
ba654f8ac2 - fix: minor memleak on leaving systems.
- comment cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4651 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-16 14:15:20 +00:00
Marc
cea8e6a33a Fix: stricter enforcement of max escorts, shouldn't trigger failed assertion for shipEntity coordinatesForEscortPosition anymore.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4649 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-16 04:06:40 +00:00
Marc
8714d26cd1 * Broken galdrive fix part II: broken or removed galdrive equipment during countdown generates the .playerJumpFailed('malfunction') event.
* Tentative fix for [ Bug #18322 ] Can't reset javascript.
- Improved log messaging: somewhat clearer 'can't reset javascript' log message, also initial speech synth status now written to the log.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4648 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-16 02:00:26 +00:00
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