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

3837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
9a88847d40 Fixed JS GC root management for frame callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4564 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-18 21:52:41 +00:00
Jens Ayton
89f98d2bf4 Change log updates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4563 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-18 19:36:48 +00:00
Jens Ayton
831a7c6b85 JS callObjC() is now only available in debug builds. Entity#dumpState() is now implemented natively so that it can be used in testrelease builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4562 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-15 21:25:46 +00:00
Jens Ayton
638f7bc91d Fixes for untargetable zero-distance wormholes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4561 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-14 19:23:59 +00:00
Nikos Barkas
ff039f221d - HUD plists without scanner definitions do not result in loss of mass lock anymore. A default scanner is drawn at full transparency instead. Not the best fix maybe, but the alternative would be to separate the mass lock behaviour from scanner drawing, which at this stage can end up creating more problems than it can resolve. 
- Dormant code for feature request #5359 (equipment_required for HUD legends) inserted. To be enabled post-MNSR.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4560 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-11 21:40:09 +00:00
Jens Ayton
b1be49fb35 Comment typos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4559 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-07 22:45:51 +00:00
Nikos Barkas
1e566c3eea Hopefully fixed the long distance targeting bug for good this time. The primary target's distance from player is now checked on a per-frame basis and the target is released if the distance is higher than maximum scanner range. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4558 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-06 09:44:38 +00:00
Nikos Barkas
7356224196 Corrections to bring some important links up to current status on external libraries source changes file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4557 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-03 17:46:00 +00:00
Jens Ayton
9c9c2ffed0 Fixed several missing JS exception checks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4556 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-31 19:09:18 +00:00
Nikos Barkas
575247de09 Fixed bug where subentities were incorrectly set up when a subentities-carrying ship was traded for another subentities-carrying one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4555 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-23 09:37:20 +00:00
Eric Walch
8316cc2a1d - Docking/launching ships now look at totalBoundingBox instead of boundingBox to see if they fit in the dock. Same boundingBox to totalBoundingBox change for calculating needed orientating to the dock while docking. 
- enteringTraderAI now checks for interstellar space (in case of a misjump).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4553 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-18 20:16:57 +00:00
Jens Ayton
38073867ef Sounds now stop when resetting game (fixes bug #18108) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4552 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-16 09:33:07 +00:00
Nikos Barkas
3e143ee3d2 Fixed bug #18097 (Fuel indicator not drawn correctly in interstellar space). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4551 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-12 21:56:16 +00:00
Jens Ayton
774c4b922b Versions that go bump in the night. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4550 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-09 20:50:15 +00:00
Jens Ayton
74f23e6f81 Sensible behaviour for setSunSkimStartCoordinates and setSunSkimEndCoordinates in interstellar space. New AI message: NO_SUN_FOUND. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4549 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-09 20:41:28 +00:00
Jens Ayton
abe7913824 Added Known bugs section to change log. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4546 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-08 08:33:30 +00:00
Jens Ayton
15280992ed NSUInteger -> OOUInteger. Funny how that now only affects Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4545 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-08 07:33:23 +00:00
Jens Ayton
4f49585bb5 Change log update for 1.75.2, please review. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4544 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-07 18:51:41 +00:00
Jens Ayton
21feac565f Remastered application icons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4543 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-07 13:21:54 +00:00