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

2523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
c6da83b81c Moved the doScriptEvent execution handler inside the disengageAutopilot method. Moved screen messages out of engage/disengageAutopilot methods in order to enable also 'silent' manipulation of autopilot, e.g. starting autopilot without having docking computer should not print any messages. Added the station we are trying to autopilot to as argument in the event handler for autopilot startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3074 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 11:39:02 +00:00
cmdrjames
bc948d492a Minor docking changes to fix xcode build. (missed a file) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3073 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 11:01:03 +00:00
cmdrjames
b8a5a35118 Minor docking changes to fix xcode build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3072 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 10:58:33 +00:00
Nikos Barkas
97dbb37187 Fixed warning in Mac build (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3071 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 10:44:27 +00:00
Nikos Barkas
2ea88ee608 Autopilot overhaul: Moved duplicated code to separate methods in PlayerEntity, namely -engageAutopilotToStation: and -disengageAutopilot:. Docking Computers now stop trying to dock the player when damaged while in operation. Created the JS PlayerShip methods engageAutoPilot (takes as parameter the station entity we are trying to dock to) and disengageAutopilot. These two deliberately do not check for the existence of docking computers before activating/deactivating the autopilot. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3070 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-20 15:50:15 +00:00
Eric Walch
1b6c9559c8 player.ship.hud = null now resets the hud for the default one for that ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3069 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-20 12:15:17 +00:00
Eric Walch
c1073f15a7 Player can now break-off auto docking when the equipment was damaged while busy autodocking 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3068 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-19 16:13:59 +00:00
Nikos Barkas
ecccd444d5 Fixed a couple of warnings on SDL builds, related to missing AI.h header in ShipEntityLoadRestore. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3067 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 23:35:17 +00:00
Eric Walch
7b4feb7bd7 - Mac only: Changed the key for opening folders in the save/load menu from Command to Control. (Same key as used with Windows) 
- Filled in some blanks for saving/restoring wormholes ships in the save file. Escorted ships now seem to continue being escorted from a loaded game. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3066 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 20:05:03 +00:00
Jens Ayton
b19e4b4a5f Added optional exolicit binormal generation to icosmesh tool (not used in Oolite at the moment). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3065 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 17:34:44 +00:00
Eric Walch
254b2fbea1 - Corrected several ships from one group ending at very different locations after wormholing a group when the player entered that systems with a long delay. e.g. after first docking at the station. (File missed in yesterdays commit) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3064 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-14 13:21:22 +00:00
Eric Walch
49fd2d95a9 - Prevent resetting the random seed when displaying the F7 screen 
- Make sure that a group of ships that disgorges from a wormhole ends up close together in case of updated times of several minutes. (Escorted groups sometimes were added at several scanner ranges distance between ships when the player did not follow immediately)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3063 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 22:02:27 +00:00
Nikos Barkas
ce68535dde Replaced switchHudTo JS method with the PlayerShip JS read/write property player.ship.hud, as per discussion in internal dev mailing list. Removed some code duplication while doing so and hopefully have not broken anything in the process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3062 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 20:31:56 +00:00
Jens Ayton
a1114c9b72 Fixed models being copied to wrong place (Mac only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3061 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 17:29:22 +00:00
Jens Ayton
02e4b2bf8a Fixed Mac build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3060 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 15:05:22 +00:00
Nikos Barkas
4146d76250 Fixed silly crash from revision 3058. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3059 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-11 11:00:06 +00:00
Nikos Barkas
ba9055cfea Implemented the PlayerEntity -switchHudTo: method, which takes as parameter the filename of the plist containing a hud definition and its equivalent JavaScript PlayerShip method, thus enabling on-the-fly HUD changing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3058 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-09 22:15:39 +00:00
Eric Walch
3e93d1f6e6 Restore the original thrust for cargo that escaped the tractor beam. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3057 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-07 22:54:40 +00:00
Nikos Barkas
e50f8ade39 Fixed a small bug where having Commander Jameson killed would restart the game with condition green instead of docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3056 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-06 22:39:16 +00:00
Jens Ayton
535798a07c Improved :spawn macro to save new ship in a property and print a message on failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3055 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 23:24:35 +00:00
Jens Ayton
129e5129f6 ProxyPlayerEntity is now used for demo ships, loading screen and shipyard. Also, player uniform bindings are now actually permitted for ProxyPlayerEntities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3054 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 22:17:51 +00:00
Jens Ayton
b44393e781 More work on player shader binding issue: ProxyPlayerEntity is now used when ejecting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3053 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:52:07 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +00:00
Jens Ayton
a4382b451f Fixed bug where space dust velocity ignored inertial velocity of player, taking only thrust into account. Exposed player velocity to JS. Initial work on fixing player-only shader binding issue described at http://aegidian.org/bb/viewtopic.php?p=103930#103930 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3051 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 18:04:06 +00:00
Jens Ayton
94d00e8086 Followup to r3049: second occurrence of same mistake. Also, fixed a typo in a makefile comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3050 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 23:22:32 +00:00
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