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

2598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
98ae67c09b Fixed incorrect setting of group leader in +shipRestoredFromDictionary: which resulted in wormhole dictionaries in saved games generating exceptions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3049 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 22:52:36 +00:00
Jens Ayton
8005e491d5 Checked in Mac nightly build script so it may be preserved for future generations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3048 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 22:04:49 +00:00
Jens Ayton
dcae5739a4 Added a bunch of exception checks in debug handling (for http://aegidian.org/bb/viewtopic.php?t=7634). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3047 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 00:22:47 +00:00
Eric Walch
3a58234c01 - When the player follows an escorted trader through a wormhole before all the escorts had jumped in, the left-behind escorts do appear correctly at the other side. As they did with 1.72 and older. (In 1.73 those missing escorts were visible in the wormhole part of a saved game but with a wrong arrival time) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3046 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-27 22:36:31 +00:00
Nikos Barkas
c7943903d5 Background images now are displayed before rendering any other entities and before enabling lights. This fixes a problem with miniature planets not being shown in the planet info screen when background images are in use. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3045 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-27 20:26:22 +00:00
Jens Ayton
0135db1752 Game no longer pauses during menu and button tracking on Mac OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3044 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-26 13:15:20 +00:00
Jens Ayton
3e0ce2e313 Fixed crash when scaled Wreckage objects were dealloced. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3043 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-26 12:05:09 +00:00
Jens Ayton
a97c00a247 system.addPlanet() and system.addMoon() now return the new planet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3042 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-26 11:33:22 +00:00
Jens Ayton
93f35500f7 Preparing Xcode project for Mac nightly builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3041 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-24 22:40:11 +00:00
Nikos Barkas
a960cc834d Better control of cloak deactivation and associated script event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3040 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-24 22:13:45 +00:00
Eric Walch
955390d1c4 - Moved both fine messages to the arrival report screen. 
- Removed a backdoor to do contract runs in a strict game.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3039 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-24 20:28:47 +00:00
Jens Ayton
baf7342f3b Giant spelling fix, woo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3038 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-23 22:04:39 +00:00
Jens Ayton
968819054f Added is_external_store equipment option (corresponding to _isMissileOrMine, implied by _MISSILE or _MINE suffix). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3037 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-19 14:16:06 +00:00
Jens Ayton
8eb9b061ee Debug script tweakage; no more <unknown script> for syntax errors on script loading. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3036 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-19 14:09:32 +00:00
Jens Ayton
d3cb28c662 Set up uniforms in sorted order so that random values are stable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3035 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-17 20:01:41 +00:00
Jens Ayton
c28bb38c8b Shader mode changes now take effect immediately. For ease of testing, made shader mode a read/write property of console. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3034 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-17 19:50:37 +00:00
Jens Ayton
f5ef568f4c Changing a ship's entity personality should now affect random uniforms (untested). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3033 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-17 19:20:57 +00:00
Jens Ayton
854316c47e Random shader uniforms are now seeded from entity personality, _but_ this is done before copying personality for player load/purchase. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3032 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-17 19:05:44 +00:00
Jens Ayton
88e8a1929a Fixes for nightly build warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3031 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-17 15:03:05 +00:00
Marc
132f95e13f When in strict mode, savegames with oxp player ships cannot be loaded. Added the appropriate error message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3030 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-15 02:22:33 +00:00
Marc
41cd953184 - Verifier: removed duplicated key entry in verifyOXP.plist and brought its associated schema up to date. 
- Scripting: added ship.canAwardEquipment() to check if a specific equipment item is compatible with that ship.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3029 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-15 01:41:14 +00:00
Jens Ayton
cccd34a13b Lifted some implicit limits so that meshes are now as unrestricted as I've previously claimed (oops). Unfortunately, loading is so slow that this will make no practical difference, except perhaps the raised smooth group count. Doing something about it put off until post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3028 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 19:02:00 +00:00
Nikos Barkas
9268242616 Fixed a bug that would allow only square splash screens to be used on SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3027 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 17:48:28 +00:00
Nikos Barkas
fbd16a33eb Made saving of old type planet textures switchable at compile time and disabled it by default to reduce clutter in the snapshots folder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3026 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 15:18:12 +00:00
Marc
b6a415ab96 The AI 'TARGET_LOST' message is now handled correctly again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3025 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 15:05:48 +00:00
Nikos Barkas
1b5dc42b67 Added the script event handlers shipCloakActivated and its other half, shipCloakDeactivated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3024 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 12:13:41 +00:00
Nikos Barkas
b5efda4c21 Upgrading libpng to version 1.4.0 for the Windows build. Ships now are considered as executing a spawn action also when launched for the first time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3023 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 02:00:53 +00:00
Marc
6c4ba9aadd yet another event name update: shipDestroyedTarget is now deprecated, shipTargetDestroyed the new improved name for it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3022 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 19:47:40 +00:00
Marc
f06e41028a fixed shipLostTarget (now works when actively targeted ships go out of range too), and added the 'more standard' shipTargetLost handler 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3021 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 19:43:52 +00:00
Jens Ayton
690f02cb32 Updated Xcode project for libpng 1.4.0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3020 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 18:15:51 +00:00
Marc
a052feb603 normalised new event name to conform to the agentItemVerb convention. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3019 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-13 18:06:40 +00:00
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