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

3906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Walch
4f73fe2b4c A wrong defined 'titleKey' for missionscreens will now log a warning instead of logging an internal error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4597 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-16 08:20:11 +00:00
Jens Ayton
8e4fb08cf7 Cleaned up some loose ends from nerfing callObjC(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4596 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-15 23:20:16 +00:00
Nikos Barkas
b436171852 Fix for Berlios bug #18307 (Docking music continues to play after hyperspace jump). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4595 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-14 11:35:51 +00:00
Nikos Barkas
368c196c01 Fixed bug where restoring subentities by script on the player ship would not adjust the trade-in factor accordingly ( see http://www.aegidian.org/bb/viewtopic.php?f=3&t=10700 ). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4594 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-13 18:52:13 +00:00
Eric Walch
5013d3c330 - Fixed bug #17997. When very close to the dock, the player now gets a few extra seconds to finish docking or to back off. 
- Fixed a bug where the player got docking clearance while there were still ships in the launch queue.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4593 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-11 16:52:16 +00:00
Eric Walch
dc9db41bfe - fixed the legacy_spawnShip function that was broken in the r3701 refactoring. 
- also fixed the spawn orientation that still was wrong in special cases.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4592 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-09 15:58:58 +00:00
Nikos Barkas
7c881c4b40 Read max_cargo as unsigned int when setting the commander's data from a dictionary, not as int, since max_cargo is of type OOCargoQuantity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4591 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-31 23:08:35 +00:00
Nikos Barkas
bd49699af7 Fixed max_cargo going negative when max_passengers was set to a value that resulted in more cargo required than available on player ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4590 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-31 21:23:20 +00:00
Eric Walch
c053277bbb Calculate the correct size for launching ships to block launching ships that don't fit the port. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4589 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-31 11:41:28 +00:00
Eric Walch
47a8486aef Ignore F-keys on Arrival Report Screens, so that only the spacebar is accepted. This avoids bypassing mission screens on docking when using F-keys on this page. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4588 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-26 21:32:34 +00:00
Nikos Barkas
30c068ef53 Fixed non-tonnage commodities at quantities higher than one ton remaining on the ship after a game reset during flight. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4587 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-25 23:06:26 +00:00
Marc
a40b89f7b3 - viewDirectionChanged should now fire correctly when switching to/from gui screens. 
- system.name, system.population, etc. should now report the correct values when in interstellar space.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4586 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-25 12:35:37 +00:00
Nikos Barkas
22bbc946c6 Fixed player ship going sometimes crazy when switching to mouse control. Note: This fix is for the SDL builds only, not sure if Mac has a similar mouse control issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4585 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-21 15:11:38 +00:00
Jens Ayton
af3e049cbc Fixes to build with Xcode 3.2.6 under Mac OS X 10.7. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4584 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-21 12:30:48 +00:00
Eric Walch
a838baedcc Correction on my last commit. Stupid C&P error. And bad testing because '[mission_foo]' is expanded separate from 'mission_foo'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4583 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-20 15:49:25 +00:00
Jens Ayton
3897958a27 Avoid exception when new-style flasher declaration is nonsense. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4582 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-17 00:07:56 +00:00
Jens Ayton
7b83744be5 Commented on documentation changes motivated by Bug #18243. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4581 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-16 12:31:40 +00:00
Eric Walch
8595f25562 - Avoid unintended string expansion when the name of a script was used in mission text or in a mission info. A script name inside [] is still expanded if there exist a corresponding mission info. 
- Added code that makes that the player exits at the same location from a wormhole as other npc ships in that wormhole. Only with a small displacement to avoid collisions. Code is still inactive though.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4580 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-13 16:10:19 +00:00
Jens Ayton
49c928fead Bumpy bumpy version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4579 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-12 07:32:26 +00:00
Nikos Barkas
ea6f887acc Updated ReadMe to not mention Growl on Mac, since it has been disabled. Also, replaced MS Word format version of the document with the equivalent OpenOffice one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4574 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-10 13:30:04 +00:00
Jens Ayton
8411c8cba5 Updated change log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4573 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-10 12:14:12 +00:00
Jens Ayton
df9737b0f5 Fixed deployment builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4572 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-06 23:18:28 +00:00
Jens Ayton
a1e4e4d8b6 Actually disabled Groolite by default due to upcoming changes in Growl. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4571 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-06 06:56:41 +00:00
Jens Ayton
fae0622c78 Disabled Groolite by default due to upcoming changes in Growl. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4570 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-06 06:50:14 +00:00
Jens Ayton
d2f7061e22 Avoid duplication of wormholes in activeWormholes list leading to unnecessary paperwork and also retain count overflows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4569 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-02 16:29:48 +00:00
Nikos Barkas
b09d841aaa Tentative fix for bug #18189 (Switching HUD (via compassTargetChanged) causes crash). In case of a scripted HUD switch while the previous HUD is being rendered, the new HUD is deferred to until previous one's rendering has been completed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4568 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-29 06:26:45 +00:00
Jens Ayton
c38002b50c Fixed leak in ship group iteration. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4567 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-24 11:25:18 +00:00
Nikos Barkas
0bfaa28b3f Fixed 'interstellar_undocking = yes;' not working for zero-distance systems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4566 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-23 17:17:51 +00:00
Jens Ayton
47d4b2c6f1 Added sunskim-trader to pirate victim roles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4565 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-21 22:14:48 +00:00