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

264 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
f67b87aa0d Ahruman's dazzling distraction attack strikes again. All beep, boop and click sounds now go through customsounds.plist. Setting the player's target through JS now works more or less as expected (locks on ident, with UI feedback, unless a missile is selected in which case current missile is locked on to the new target). Custom sound tags can now expand to other custom sound tags (with recursion checking), and final results are cached. No actual progress on the nova script I thought I was working on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1477 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 19:49:46 +00:00
Jens Ayton
627e5a9b57 shipWillLaunchFromStation() is once e again called for the player. Ejected items and debris are now spawned with 85% of the parent's cabin temperature. Incompatible OXP message is now loaded from descriptions.plist, but only the internal descriptions.plist; listing incompatible OXPs and generating the messages later would be a better approach. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1476 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 08:25:42 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +00:00
Jens Ayton
f68d550d8e Added JS Ship methods dumpCargo(), ejectItem() and ejectSpecificItem(). Spotlight indexer now indexes required.plist max_version for display in More Info. Fix for internal consistency in default fragment shader's handling of specular exponents. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1471 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 15:27:06 +00:00
Marc
91358f71a2 More station defence stuff. Special cargo expanded and amended: it can now be saved, and no containers can be loaded on board while the special cargo is in the hold - scooping cargo will not work, and purchasing & awardCargo are only allowed for small valuables. Added a few more strings for translations. Minor code tidy up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1467 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 04:10:42 +00:00
Jens Ayton
3f74d1b923 Got Instruments working and fixed several small leaks. Currently mostly seeing occasional leaks of OOWeakReferences to ships (but the ships themselves aren't leaked and OOWeakReferences are only 8 bytes.) Cobbled together a class for handling groups of sources for related sounds, so that e.g. the number of simultanous scrape sounds is limited. Moved bits of player launching logic from pollDockedControls: to leaveDock: (which is also called from other places). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1465 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-08 17:16:10 +00:00
Jens Ayton
2b89827eb3 Graphics fiddle: scarred alloy is now only scarred on one side, and has a specular intensity map (if shaders enabled); both types of alloy are now shinier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1462 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-06 18:13:57 +00:00
Jens Ayton
5f09cc936a Fixed a bug where subentity relationships would be messed up by -becomeLargeExplosion (currently only used for the player). Better diagnostics for bad AIs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1458 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 23:45:09 +00:00
Jens Ayton
4c3cf42f7e Fixed a small leak in the previous revision. Unified the various missile/ident locked-on strings. Made :: console macro work for methods with an argument string, as in :: playSound: boop.ogg. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1457 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 11:26:12 +00:00
Marc
2ca6f60d5c GnuMake cleanup: just the one logcontrol file now, and removed compiler warnings from PlayerEntityLegacyScriptEngine 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1455 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 20:32:38 +00:00
Jens Ayton
aaee1b7fcb Fixed testing-related breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1454 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 02:02:15 +00:00
Jens Ayton
7c242079fc New skies even for gnusteppy people. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1453 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-04 01:43:42 +00:00
Jens Ayton
3671b45b17 Silenced sky setup messages; stopped making player-fired missiles dump AI debug messages; collection-extracty cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1452 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 22:43:18 +00:00
Jens Ayton
ef3cb81251 Multi-texture skies are go. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1451 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 22:02:53 +00:00
Jens Ayton
84412f33cc Added safeScriptActionOnTarget:, removed some unused code, fixed copy&paste error in sky setup, added sanity check to ensure the main station is in fact a station. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1450 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 20:41:08 +00:00
Nikos Barkas
74ae10a5c9 Resolution for bug #12659 (scripted cargo pods do not award cargo when scooped). Added the CLASS_CARGO scan class to alloy and splinter in shipdata.plist, so that they don't appear unscoopable and with legal status when spawned by scripts. Finally, yes, you guessed it, more strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1448 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 06:46:40 +00:00