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

1314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jens Ayton
649a8ca9c3 OOCPUCount() now works under Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1613 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 22:21:34 +00:00
Jens Ayton
6e02b1f0f0 Fix for billboard bug - suns are now the right size, but have no coronas. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1612 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 15:08:12 +00:00
Jens Ayton
6444b5d5e9 Moved demo2 screen over to OOShipRegistry. No more blank spaces or crashes for empty lists, possibly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1611 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:39:56 +00:00
Jens Ayton
b3bace6ba2 Improved -copy and -mutableCopy performance for OOProbabilitySet. I thought I had a clever idea for an O(log n) mutable probability set last night, but can't remember it now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1610 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:35:10 +00:00
Jens Ayton
ac894b5309 Moved newShipWithRole: and all ship dict lookups over to OOShipRegistry. Profiling shows that the slow case in newShipWithRole: has a ~20% hit rate with anarchies, dictators and commies installed, indicating optimization of OOMutableProbabilitySet is required, but it's still faster than the old code. OOShipRegistry now blocks inheritance of display_name. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1609 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 13:08:20 +00:00
Nikos Barkas
6e6f5d0ff4 Removed redundant broadcastMessage: method. The one in use now is broadcastMessage: withUnpilotedOverride:. Also removed redundant ExpandDescriptionForCurrentSystem call in the commsMessage: withUnpilotedOverride: method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1608 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-03 10:36:29 +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
Nikos Barkas
edf000ec1d Implemented commsMessageByUnpiloted for legacy scripts and ship AI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1606 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-02 17:43:40 +00:00
Nikos Barkas
7b546c09e3 Refactored +(NSMutableDictionary*)getNativeSize and made it return screen native size also under Windows. Minor indentation fixes to MyOpenGLView.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1605 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-02 05:42:57 +00:00
Jens Ayton
6521c91b02 Added swathes of pointless and annoying type casts to placate buggy gnu-gcc ObjC front end. Also fixed JS player.alertEnergy and player.alertHostiles under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1603 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-01 01:02:57 +00:00
Jens Ayton
1e3aec21f4 Fixed default value in string extractors (broken in last rev). Changed semantics of JS timer constructor to match documentation (negative delay gives paused timer). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1602 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 20:54:13 +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
fa3c4ed3c3 Attempt to fix bug whereby many ships leave the station with the wrong AI. See also http://www.aegidian.org/bb/viewtopic.php?t=4543 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1598 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-29 17:49:09 +00:00
Nikos Barkas
5a84f7600b Fixed a couple of parts of the HUD that were failing to disappear whenever HUD got switched off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1596 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-29 13:36:57 +00:00
Jens Ayton
4933fb7796 Fix for ship.sanityCheck.failed messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1595 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-28 17:10:36 +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
Nikos Barkas
f370e1b502 Fixed [UNIVERSE sun] not returning the correct sun entity when in witchspace. Added the IsSunPredicate funtion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1590 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-27 12:53:37 +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
Nikos Barkas
206e883362 Fixed crash on entering witchspace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1585 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-26 11:49:59 +00:00
Nikos Barkas
943c55e1f3 Fixed mouse doubleclicking related problem in the load-save screen. Mouse status is now cleared upon entering a gui screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1583 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-25 14:50:50 +00:00
Jens Ayton
8f14df9fb3 Applied Adam Sampson's patch to makefile for Linux. Look forward to reports of it working, or not. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1582 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 18:10:07 +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
3046e3072f Fixed subentity flasher on/off code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1580 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 00:39:13 +00:00