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

3924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
02eca5ee69 Fixed typo in changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4694 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-05 12:54:06 +00:00
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 16:08:14 +00:00
Michael Werle
cb2d00a924 Bump version number to 1.77; start new Changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4691 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 15:14:11 +00:00
Nikos Barkas
16dc33594a Lifted guards from feature 5359 (equipment_required for HUD legends) implementation. Feature is now active. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4690 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 14:26:38 +00:00
Michael Werle
d4066989e8 Reverse Compass - allows stepping backwards through beacons. 
Shift-\ (|) is now bound to stepping through the Advanced Space Compass's
targets in reverse order.  Beacon-list has been converted to double-linked
list to facilitate this.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4689 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-02 20:37:06 +00:00
Eric Walch
c5399fc202 'sendAllShipsAway' no longer tries to send ships without hyperSpaceMotor away. They won't jump anyhow and now they keep their original AI so that at least escorts without hyperSpaceMotor can follow their mother through her wormhole. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4688 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-01 16:17:36 +00:00
Jens Ayton
527b3214c7 Remapped ASS to Assignment in JS error identifiers. Also added some missing ones. Hmm, this should be automated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4686 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-25 11:30:17 +00:00
Jens Ayton
e7076105a3 Comment typos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4685 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-24 09:09:24 +00:00
Eric Walch
4c0ef848d4 Updated the keyconfig.plist for the BBC with all the new keys current Oolite contains. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4680 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-16 09:22:39 +00:00
Michael Werle
7dfdf6cde9 Changes to CHANGELOG as notified by Eric. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4678 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-09 15:24:44 +00:00
Nikos Barkas
39f4462057 Updated license file reference year. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4677 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-07 11:08:08 +00:00
Michael Werle
ef261a5f3e Draft Changelog for 1.76; thanks to Eric for starting this. Please review! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4676 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-06 17:19:56 +00:00
Marc
e501b79534 Wormholes fixes: 
- stopped NPCs following the player at different times from smashing against the navbuoy.
 - 'velocity zero' fix ported to NPCs following the player.
Minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4675 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 20:25:11 +00:00
Nikos Barkas
c665a084d8 MNSR step 1: Rolling version number to 1.76. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4674 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 17:51:19 +00:00
Eric Walch
450c395138 - AI fix for homeAI. When multiple escape pods are launched, there is no longer a part suddenly disappearing. 
- AI fix for looting to prevent a ship circling around a cargo pod as I witnessed the other day.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4673 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-02 17:18:30 +00:00
Nikos Barkas
f8b7668b3c Fixed memory pool error when a game was being loaded from the command line on SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4672 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-02 13:41:13 +00:00
Marc
3f010a5e0f Reinstated 'destructive' Makefile clean under windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4671 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-01 17:31:20 +00:00
Marc
6e06f5c94c In windows, 'make -f Makefile clean' now asks for confirmation before deleting the contents of oolite.app and the AddOns directory 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4670 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-30 00:05:17 +00:00
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