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

318 Commits

Author SHA1 Message Date
Jens Ayton
e10591c31a Renamed JS Vector to Vector3D to avoid namespace issues in JavaScript 2.0. Added bounty property back to JS player. Oversight of player vs. player.ship in built-in scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1727 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-07 08:06:08 +00:00
Jens Ayton
4ca8806312 Bunch of cleanup, mostly tabs vs. spaces (yes, I'm silly). Reformatted AIs for consistency, and removed do-nothing handlers. Deleted old sky code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1724 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 15:44:57 +00:00
Jens Ayton
585a1bb940 Fix for OS X-specific build issues (recommend deleting build folder and rebuilding all). Missiles now respond to ECM during initial launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1722 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-03 13:25:30 +00:00
cmdrjames
ff1877412e make hard heads same as normal misiles for launch phase 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1719 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:45:55 +00:00
Jens Ayton
e92acd10cc Better support for cluster missiles - submunitions can now inherit their parent's target (using is_submunition shipdata.plist property). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1718 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:37:58 +00:00
cmdrjames
89d837daaf reduce deprecation warnings by changing player.docked to player.ship.docked 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1717 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:16:22 +00:00
Jens Ayton
87d724fc8a Fix for bug in prefix script adding player compatibility aliases to all objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1716 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 19:19:01 +00:00
Jens Ayton
3315272c00 Split JS Player object into Player and PlayerShip. Made curved sides of arc-detail smooth. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1710 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 17:34:37 +00:00
Nikos Barkas
ca392b105c Log joystick handler initialization as per Oolite standard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1709 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-28 11:39:40 +00:00
Jens Ayton
d1b8371864 Builds (without warnings) under 64-bit Ubuntu with GNUstep-base 1.12. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1707 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-27 15:16:33 +00:00
Jens Ayton
d5fad77a34 Added JS Ship properties cargoSpaceUsed, availableCargoSpace, passengerCount and passengerCapacity; renamed maxCargo to cargoCapacity (and added compatibility getter in prefix script). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1693 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-15 14:50:25 +00:00
Jens Ayton
fb3b2b7ebe Shipyard code now uses OOShipRegistry. Simplified some code by using OOEquipmentItem instead of fiddling with arrays; should do more of that. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1691 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-11 20:25:09 +00:00
Jens Ayton
717e72ffae New compiler, new warnings about problems that don't really exist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1690 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 21:11:28 +00:00
Jens Ayton
a8b39c4c9a Refactored equipment restriction tests, and apply them in addEquipmentItem: as well as the shopping screen. Added new class representing equipment types, currently only used in these tests. Added new equipment restrictions: requires_free_passenger_berth, requires_full_fuel, requires_non_full_fuel. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1689 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-10 20:45:02 +00:00
Jens Ayton
53e5244d68 Fixes for patrol AIs (bug #14160). Marked Naval Energy Unit incompatible with standard unit. Check docked status in mission scripts for compatibility with scripts that force immediate launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1686 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-08 23:15:33 +00:00
Jens Ayton
f2c07b5ee7 Fixed a few leaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1684 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-04 16:01:26 +00:00
Nikos Barkas
a4dd5f4043 Modified the Thargoid Plans mission script to remove the standard energy unit - damaged or not - before awarding the naval one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1680 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-19 15:47:12 +00:00
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
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
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
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
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
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
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
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
Jens Ayton
30bce0b115 Great big lump o' stuff to deal with ship types and related things more cleanly. 
OOShipRegistry parses shipdata.plist, shipyard.plist, demoships.plist and new shipdata-overrides.plist and shipyard-overrides.plist, resolves like_ship inheritance, does some sanity checking, filters out various sorts of invalid shipdata and shipyard entries and manages role->ship key mapping with probability weighting.

The latter is managed by OOProbabilitySet, which should probably be used by OORoleSet and OOProbabilisticTextureManager too. OOProbabilitySet is O(log n) for random selection instead of O(n) like the current linear-search code.

The next step is to start using OOShipRegistry everywhere.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1607 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 00:58:21 +00:00
Jens Ayton
ff322eafcb Fix for bounty and contract market credits display bugs. Fix for rounding of credits quantities. Added troubleshooting code to scanForNonThargoid. Suppress script.javaScript.context.create messages. Made property list extractors for strings auto-convert numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1601 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 19:13:02 +00:00
Nikos Barkas
fc9ba4eb28 Set default multiplier values for star and nebulae to 2 and 1 respectively. Reverted to original star and nebula counts in interstellar space. Star count in system space is now halved if in reduced detail mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1600 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 07:39:05 +00:00
Nikos Barkas
18ee20b861 Added star and nebula count multipliers in planetinfo.plist. Attempt to prettify skies by increasing the number of stars by a factor of 5 and the number of nebulae by a factor of 10. Also bumped version number on Windows/Linux build scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1592 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-28 05:43:26 +00:00
Jens Ayton
12dc18297b Changed oolite-constrictor mission version to match release version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1588 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 14:21:34 +00:00
Jens Ayton
30ee81765c Fixed script error in cloaking device mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1587 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 13:52:18 +00:00
Jens Ayton
fba5cb83b1 Removed redundant [UNIVERSE gui] calls in PlayerEntityControls. Added Spotlight indexing of system name and made ship name visible in Get Info window (OS X only). Added new formatting functions for credit quantities, used throughout. DESC() now returns the key if no string can be found, to avoid exceptions. I18Ned OXP incompatibility message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1581 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 16:56:23 +00:00
Jens Ayton
07d8d4ae50 I18ned Groolite mode strings. Use typographic multiplication sign for screen resolution strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1578 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 16:13:03 +00:00
Jens Ayton
01c7ccbc10 Bumped version numbers (trunk to 1.72, 1.71-maintenance to 1.71.1). #ifed out redundant like_ship check in ShipEntity, with log message in event of it turning out not to be redundant. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1577 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 10:44:26 +00:00
Jens Ayton
b07b78a42d Fix for formatting mismatches between unsigned long long credit quantities and %d format specifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1575 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 21:58:06 +00:00
Jens Ayton
a3cd6cf6ca Stuff from r1565-r1566, now with not doing the svn in src/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1567 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:02:38 +00:00
Jens Ayton
a09eb90389 Trimming down to four nebula textures, step 3 of 2 (syntax fix, updated Xcode project, updated contributors.txt). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1559 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:36:01 +00:00
Jens Ayton
92996fd787 Trimming down to four nebula textures, step 2 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1558 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 13:31:05 +00:00
Nikos Barkas
56a8907cb5 Checking in Eric's fix for the Constrictor mission incorrectly resetting mission briefing after the Constrictor has been destroyed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1556 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-18 09:43:22 +00:00
Marc
6ef2d66b16 JS Bugfix: changes to local system properties (tech level, government, etc...) now take effect immediately. Minor change to a new description string. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1545 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-06 00:18:03 +00:00
Marc
cc9f7cd857 Energy unit changes: energy units recharge rate adjusted to offer a better challenge to the player, and naval/extra energy unit purchase behaviour more flexible (see resolution of Bug #13507, Naval Energy Unit bug in berlios). Warnings added if energy units are going to be removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1544 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 16:12:59 +00:00
Jens Ayton
69003c93ed Added Thargoid Curses to SystemDescription.dot output, and changed the Eat Foo, Bar! insult to use more varied values of Foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1521 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 09:31:35 +00:00
Marc
3990d547dc Minor plists cleanup, added player.equipmentStatus & player.setEquipmentStatus, to allow damaging and repairing equipment via javascript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1511 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 03:38:50 +00:00
Jens Ayton
d9a7e5e585 Adaptive collision octree depth selection; preload sounds from customsounds.plist to avoid stutter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1508 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-24 16:52:30 +00:00
Jens Ayton
2daba8a6bf Several fixes for an exception when trying to use OXP verifier while a requires.plist-incompatible OXP is installed, due to use of DESC in generating incompatibility warnings (Universe is not set up when OXP verifier runs). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1504 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-23 15:12:22 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Jens Ayton
9cfe8c910a Removed all magic equipment flags. Moved equipment list into ShipEntity. Ship loading and saving now mostly uses OOCollectionExtractors, and is generally simpler and more robust. Be on the lookout for interesting new equipment-handling bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1490 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 23:16:07 +00:00
Jens Ayton
5020326bf6 Unbroke docking AI (checked in without finishing up and testing yesterday, oops). Fixed a log typo. Music now resets when player dies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1487 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 09:52:59 +00:00