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

1339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
bfe691b517 Added the missing has_npc_traffic key to the known station keys in verifyOXP.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1678 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-14 07:46:16 +00:00
Nikos Barkas
fea50ac4b7 Added player.contractReputation and player.passengerReputation visibility to the JavaScript player class. Also added the JS methods player.increaseContractReputation(), player.decreasePlayerReputation(), player.increasePassengerReputation() and player.decreasePassengerReputation(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1677 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-10 15:53:14 +00:00
cmdrjames
ec1d7f45bd Explicit float literal usage 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1676 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-08 21:27:55 +00:00
Nikos Barkas
7212c8a461 Attempt to fix problem with GNUmakefile.postamble not being able to complete the build process on older GNUstep distributions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1675 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-06 13:49:45 +00:00
Jens Ayton
9c9c4b53a0 * Ships with unresolvable like_ships references are now removed as intended. 
* Filtering out ships without roles or models now happens after like_ships relationships are applied, so incomplete ships can be used as templates. Added is_template property to explicitly exclude ships at this stage without error messages.

PAGroove_Stations now works properly.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1674 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 19:23:10 +00:00
Jens Ayton
a95a581ac9 Improved fallback behaviour when failing to generate a station. Fixed a "Ship foo was not set up from dictionary" error when failing to create stations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1673 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 18:16:50 +00:00
Jens Ayton
ea6fe98212 Avoid “cannot iterate into directory” messages for nonexistent AddOns directories. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1672 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-04 17:36:51 +00:00
Nikos Barkas
baf76050ff Small correction in the GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1671 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:58:23 +00:00
Jens Ayton
20e62f3151 Removed junk lines from nova script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1670 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:21:34 +00:00
Jens Ayton
db1a95e102 Makefile update for r1668. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1669 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:19:19 +00:00
Jens Ayton
6110052f8a Added JS system.info property and System.infoForSystem() function to replace setPlanetInfo: and setSpecificPlanetInfo:. Currently these are write-only, should be read/write. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1668 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:16:40 +00:00
Nikos Barkas
759da63a60 Clean up nearby destinations cached info if the WITCHSPACE UNAVAILABLE message is sent to the AI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1667 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-02 10:06:15 +00:00
Nikos Barkas
451297e529 Improved implementation of fuzzy booleans. As a result, wrecks work again now. Cached result of [UNIVERSE nearbyDestinationsWithinRange] in -performHyperSpaceExitReplace: because looking for nearby systems in every frame is very expensive. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1665 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-02 08:20:47 +00:00
cmdrjames
1c5949869a Non functional changes to float and double (and a few other types) to make it clearer what is going on with casts and coercion. Most ship entity math is done with floats, so prefer floats over doubles 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1664 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 11:25:06 +00:00
cmdrjames
189e8e7eaa Non functional changes to float and double (and a few other types) to make it clearer what is going on with casts and coercion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1663 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 11:20:18 +00:00
Nikos Barkas
1b7b8ea5c8 Player ship turrets are now fire-enabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1662 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-31 07:25:54 +00:00
Jens Ayton
a11ce38786 Made JS player.orientation work properly. Fixed some extra-niggly warnings. Made various JS system properties return placeholder values in interstellar space. Added -[Universe inInterstellarSpace] method, and made -[Universe currentSystemData] return placeholder values in interstellar space. Two new localizable strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1661 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 19:12:31 +00:00
Nikos Barkas
08ebc6dd29 One more string farmed out. Apparently they will never end. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1659 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 12:09:37 +00:00
Nikos Barkas
d97720b1a7 Even more hardcoded strings found and externalized. Are they ever going to end? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1658 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 10:55:00 +00:00
Nikos Barkas
b81d73ffd7 Fixed copy/paste error that resulted in hyperspace start and hyperspace abort sounds being the same. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1655 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-25 16:44:29 +00:00
Nikos Barkas
c572512be2 Fixed overflow when buying ship in the shipyard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1654 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-25 10:04:10 +00:00
Nikos Barkas
c6302e5e77 Fixed a small error that would prevent setGalacticHyperspaceBehaviour() from functioning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1653 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-24 10:00:35 +00:00
Jens Ayton
332dfc6a1b More annoying casts to placate the stupidity of gnu-gcc. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1652 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-23 21:45:27 +00:00
Jens Ayton
7a574a8b3e Long-lost nephew of the revenge of JavaScript error handling clean-up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1651 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-23 19:38:43 +00:00
Nikos Barkas
f699512601 Make species name for captured/rescued characters subject to lowercase_ignore for i18n reasons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1649 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-23 17:49:20 +00:00
Jens Ayton
b148cfd85d More work on JavaScript error checking. More rigourous! More informative! More not buggy! And, conversely, probably also more buggy. I've almost certainly broken something silly. Also moved JS nova-related functionality into Sun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1648 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-23 07:51:00 +00:00
Marc
c21fc50127 incompatibleWithEquipment / requiresEquipment dependancy bugfix 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1647 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-22 08:59:25 +00:00
Jens Ayton
3c82f379e0 Fix for incorrect error handling in OOJSVector and OOJSQuaternion. Only 20 pseudo-classes left to handle! Also fixed Quaternion.rotate(), this time for real. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1646 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-20 17:15:41 +00:00
Marc
1c0a991e74 Corrected merge snafu in ShipEntity(trunk) & ported 2 events to maintenance(updated one deprecated event name to use the new event name, added shipBeingAttacked to world events) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1645 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-20 10:47:40 +00:00
Marc
6f80e3bb37 Bugfix: Bug #13712 - Hyper speed approach to a moon crashes ship. If the player gets closer than 25km from a moon the ship is mass locked, no matter how small the moon itself is. 
1.72: events cleanup: now player receives shipBeingAttacked, reworked shipExitedPlanetaryVicinity (now with planet parameter in most cases) & shipEnteredPlanetaryVicinity and re-added "AEGIS_CLOSE_TO_PLANET" AI message for compatibility with earlier oolite. Corrected the name of a jumpCountDown event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1644 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-20 04:01:45 +00:00
Nikos Barkas
3ac2fa38bb Fixed compass not switching to station when approaching main planet close enough. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1643 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-19 06:09:10 +00:00
Jens Ayton
0bda7466a6 Changes to pave the way for JavaScript 1.8 upgrade. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1642 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-18 16:22:00 +00:00
Jens Ayton
ed6319c50c Moved JS Entity.call() into debug console, so it is only active with debug OXP. Exposed ship desiredSpeed property to JS. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1641 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-17 19:27:37 +00:00
Nikos Barkas
b30914187c Added the JS global randomInhabitantsDescription() method. Takes a boolean parameter or no parameters. If parameter is true, a random inhabtitants description in plural is generated. If parameter is false or no parameter exists, the generated description is in singular form. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1640 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-17 11:17:44 +00:00
Marc
fd377b0208 Changed GNUmakefile.postamble to make it compatible with both 1.x & 2.x versions of GNU make. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1639 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-15 10:07:17 +00:00
Nikos Barkas
132a643af6 Two more hardcoded strings out to descriptions.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1636 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-14 14:14:13 +00:00
Marc
a39a8f17c4 bugfix:[ Bug #13711 ] Sun approach reports docking station. Plus for 1.72: changes to AI messages and js events: Getting close (2x radius from the surface) to any moon or planet generates "CLOSE_TO_PLANET" & shipEnteredPlanetaryVicinity, moving away from any planet generates "AWAY_FROM_PLANET" & shipExitedPlanetaryVicinity in addition to all other events/messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1635 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-13 23:21:16 +00:00
Jens Ayton
a04e4dcb37 Fix for constant exceptions when there are planets in witchspace (backported). Removed a bunch of cruft from Universe, and scanForNonThargoid debug messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1634 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-13 17:44:36 +00:00
Nikos Barkas
3ead8a420d Slightly cleaner fix for player not getting tagged as aggressor when attacking NPCs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1632 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-13 08:26:30 +00:00
Marc
38f230d6de Bugfix: NPC could become offenders when defending from a player attack (player wasn't recognised as the aggressor). Ported 'U' bugfix to maintenance branch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1631 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-12 21:03:08 +00:00
Marc
bde0379e85 Bugfix for bug #13041:resolved odd behaviour with 'U': 1) if scanner enhancement is present, the hud will confirm both missiles on safety & ident system deactivation. 
2) Scrolling through targets from inactive ident system doesn't change missiles status anymore. Added Ship.commsMessage('msg') to replace Ship.call('commsMessage:','msg') - no apparent conflict with Player.commsMessage();

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1630 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-12 05:06:09 +00:00
Nikos Barkas
83395a7db3 AI fixes: Thargons no longer shoot their motherships if they fail to find a valid target. Applied Eric's fix to homeAI.plist so that escape pods no longer crash on the planet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1628 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-11 17:25:58 +00:00
Jens Ayton
d65190fdb5 Fix for shipyard techlevel bogosity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1625 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-09 17:10:50 +00:00
Nikos Barkas
4a0d7185ca Fixed crash when a key referring to a nil array would be passed to ExpandDescriptionsWithLocalsForSystemSeed(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1623 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-09 16:17:57 +00:00
Jens Ayton
8ab40bdf11 Fixed two bugs in music controller: attempting to play a music file that does not exist caused controller to lose track of current music, and a failure to release music when swapping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1622 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-09 13:24:59 +00:00
Jens Ayton
d7badeebd4 Various twiddles while failing to fix corona bug: gDebugFlags now exposed through JS console (as console.debugFlags), added warning message for shipyard entries with no matching shipdata entry (but suppressed by default for compatibility with Realistic Shipyards), log on PPC Macs no longer reports incorrect Altivec availability information (we don't use Altivec anyway), removed unused shipdata ivar from Universe. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1621 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-08 19:48:22 +00:00
Nikos Barkas
1a04936501 Gave back to suns their coronas. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1619 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-06 16:18:56 +00:00
Nikos Barkas
293e4693aa Fixed identification system not switching off after player restart. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1617 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-06 10:08:24 +00:00
Nikos Barkas
329c0e483e Fixed ECM being still active and compass not resetting to basic functionality after player restart. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1615 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-05 15:55:58 +00:00
Nikos Barkas
30122819bd Improved FPS calculation. FPS now displays correctly even with V-sync on. Old method is still used when the clock is adjusting. Oolite now runs by default with V-sync on on the SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1614 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-05 05:30:10 +00:00