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

2467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Walch
c1a3e4c425 - Added some missing keys to verifyOxp.plist 
- Minor AI changes.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3018 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 17:55:02 +00:00
Marc
078824ad86 - simplified a recent code change 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3017 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 17:54:17 +00:00
Nikos Barkas
91a328da42 Added the event handler shipAcquiredTarget. The handler playerTargetedMissile is obsoleted as a result. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3016 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 13:03:37 +00:00
Jens Ayton
c451c8f454 lighsActive starts off as true (default for initially_on). Use >= rather than == for argc checks unless there's a very good reason not to. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3015 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-09 23:24:18 +00:00
Nikos Barkas
56d279150a Fixed non working 'initially_on' property for new style flasher declarations (flashers were always switched on). Corrected minimum number of arguments in OOJSSystemInfo's routeToSystem method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3014 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-09 23:08:30 +00:00
Jens Ayton
a90629799d Added lightsActive JS ship property and shader binding, tied into switchLightsOn/switchLightsOff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3013 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-09 16:56:04 +00:00
Jens Ayton
efa62c5d96 After much debugging, writing specialized debugging tools, scratching my head and procrastinating, apparently fixed wormhole save/restore crashes through sheer nonsensical voodoo. Bah. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3010 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-06 19:39:56 +00:00
Jens Ayton
ead671d8eb Suppress exceptions during autosave, rather than exploding in the player's face. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3009 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-06 19:35:09 +00:00
Jens Ayton
a2527b3f44 Fixed a retain count problem that's masked by the cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3008 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-06 18:53:06 +00:00
Eric Walch
9ce0a926a2 Blocked a way to revive a killed player by launching an escape capsule in his "shipDied" actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3007 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-06 10:36:21 +00:00
Nikos Barkas
d24506327e Fixed crash when distances between systems in different galaxies were requested by scripts. Added the routeToSystem method in the OOJSSystemInfo class. Takes as parameters the ID of the systemto find a route to and optionally the route type optimization, which can be 'OPTIMIZED_BY_JUMPS' or 'OPTIMIZED_BY_TIME' for now. Retrurns the dictionary describing the route found. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3006 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-05 19:20:13 +00:00
Nikos Barkas
5c44527f4c Fixed comment making reference to obsoleted galactic hyperspace behaviour identifier to eliminate potential confusion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3005 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-05 10:50:46 +00:00
Nikos Barkas
d484aa2c10 Moved HUD toggling to application controls, so that it can be used at any time, even when not in flight. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3004 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-03 16:37:29 +00:00
Eric Walch
e8ae0f1f23 AI tweaks 
- Added a few extra tests for OFFENCE_COMMITTED so attack on clean ships around the station are better registered.
- Raised the jump range for an exitingTrader to outside the mass lock range of a heavy torus station. (Won't affect other traders as ships should never reach this range.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3003 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-02 21:06:21 +00:00
Eric Walch
6dcb052dc2 AI tweaks 
- Added a few extra tests for OFFENCE_COMMITTED so attack on clean ships around the station are better registered.
- Raised the jump range for an exitingTrader to outside the mass lock range of a heavy torus station. (Won't affect other traders as ships should never reach this range.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3002 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-02 21:05:10 +00:00
Eric Walch
d0a3b17b21 - Better check for crashing nil object. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3001 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-30 21:51:21 +00:00
Eric Walch
41d0d79ad7 - SystemInfo.systemsInRange now does not find the current system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3000 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-30 17:26:51 +00:00
Eric Walch
170648c61b - Corrected y-coordinate of SystemInfo.coordinates 
- Corrected a crash when no argument was used with SystemInfo.distanceToSystem()

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2999 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-30 15:26:02 +00:00
Eric Walch
74460590ca No longer missing text in the saved comm_log 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2998 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-26 22:30:34 +00:00
Jens Ayton
bc853d914b Wormholed ships' groups are now restored. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2997 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-24 10:31:52 +00:00
Jens Ayton
68c919aab4 Fixed a bunch of Clang static analyzer issues. 
As part of this, -[ShipEntity newMissile] was renamed to -selectMissile, because the "new" prefix conventionally indicates a method that returns a new object which is not autoreleased (as in -[Universe newShipWithRole:]).

Also introduced a bunch of annoying but technically correct "potential leak" issues. (These all refer to cases where an object is weakRetained and passed to JS_SetPrivate(). They aren't actual leaks, but they don't follow normal OpenStep retain/release behaviour.)"

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2996 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 23:21:21 +00:00
Nikos Barkas
c89ffe7eca Fixed a couple of warnings appearing on the Windows build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2995 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:46:51 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:20:55 +00:00
Jens Ayton
414303ad15 Face winding is no longer adjusted automatically for DATs with explicit normals; instead, the converter tool has various options for handling it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2993 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 21:47:39 +00:00
Jens Ayton
6ccd9dd544 Turned off new planets until post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2992 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 21:45:10 +00:00
Eric Walch
3e649631cb Corrected a recent C&P error with a sun radius 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2991 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 13:52:13 +00:00
Jens Ayton
35017a7ed1 Removed Leopard-specific method from r2989. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2990 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-22 14:41:48 +00:00
Jens Ayton
f9603b2f0b Support for explicit per-vertex normals and tangents. Also support storing material names out-of-line for less redundancy/smaller files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2989 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-22 13:10:31 +00:00
cmdrjames
88cf87730d Provide access to target system. Perhaps this should be system name? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2988 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-21 22:30:55 +00:00
Nikos Barkas
d81fe3d67c Eliminated a 'method defined but not used' warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2987 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-21 13:11:49 +00:00
Marc
26615e7e2e - minor code cleanup to the tweaked fuel formula. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2986 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-21 12:48:24 +00:00
Marc
152e889b32 - tweaked new fuel prices. 
- integrated fuel_charge_rate with the verifier & clamped it between 1/3 & 3x of the calculated fuel prices.
- disabled new fuel prices for the time being.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2985 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-21 11:47:16 +00:00
Jens Ayton
c2860317a4 Re-enabled energy bomb until post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2984 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-20 21:51:31 +00:00
Eric Walch
1084f1dbbe - fixed missing "roll" of stations on a mission screen. 
- fixed the "pressed space" when a mission screen was shown on startup for a Jameson.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2983 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-20 18:18:52 +00:00
Nikos Barkas
0c0a194281 Fixed crash related to unsigned active missile variable turning negative (thanks Marc). More detailed description in comment regarding non-standard shader implementation for lights handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2982 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-20 17:26:01 +00:00
Jens Ayton
6948b2130a Fixed broken player.ship in r2980; energy bomb compensation now only kicks in if EQ_ENERGY_BOMB is not available, making complete restoration a simple equipment.plist change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2981 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-19 22:57:08 +00:00
Darren Salt
22546a3bdd Fuel price & scooping changes. 
Cost & rate depend on the calculated mass of the ship.
(Some ships need density adjustments for sensible results.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2980 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-19 16:30:34 +00:00
Marc
2f9798968e - fix: sunlight is now restored properly after loading savegames. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2979 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-19 14:01:54 +00:00
cmdrjames
c61cce22d2 minor changes to reduce xcode analyzer warnings. Hopefully I didnt break anything. Did plenty of testing, and it all seems ok. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2978 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 22:49:24 +00:00
Jens Ayton
edaa8aed30 Why, of *course* I test every change thoroughly before checking in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2977 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 14:57:14 +00:00
Jens Ayton
0391332d16 Energy bombs are now converted into Q-mines when awarded by scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2976 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-17 14:51:01 +00:00
Eric Walch
48a6c47d38 - place the larger miniatures on the F7 screen a bit further away from the player to let them fit better on screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2975 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 15:00:04 +00:00
Jens Ayton
b0f62bcc4b Debug code for planet colour issue (caused by unexpected lighting changes); trigger with console.debugFlags = 0x10000000 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2974 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 12:19:36 +00:00
Jens Ayton
64b4d4e9e3 Minor cleanup; made fallback material as weird-looking as it used to be. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2973 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-16 11:57:00 +00:00
Nikos Barkas
1cca29a600 Made joystick mapper screen strings localizable. Attempt to control long strings from messing up the stick mapper screen (test and fine tuning may be required). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2972 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-15 21:38:03 +00:00
Marc
4963ccebcb restored missing texture triangle. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2971 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-15 09:22:36 +00:00
Darren Salt
1ec2b725be Fix build without NSOperation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2970 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-14 19:03:18 +00:00
Nikos Barkas
0e1226ca80 Roll year to 2010. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2969 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-14 16:58:32 +00:00
Jens Ayton
af087d42a8 Entity personalities are now copied from shipyard display models and restored/synthesised from saved games, so in the shiny future we can shop for specific colour schemes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2968 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-13 20:44:25 +00:00
Marc
8245dcf40c Systems in G5-G8 which are supposed to have pink or vast oceans now do. (individual values might need tweaking) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2967 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-13 12:32:31 +00:00