Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into steady-state-ecosystem

Browse Source 
Conflicts:
	src/Core/Scripting/OOJSEntity.m
This commit is contained in:
cim 2013-08-27 13:15:33 +01:00
commit 028fa0c8aa
29 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/CHANGELOG.TXT
View File

@ -37,6 +37,12 @@ Changes between Oolite 1.77 and Oolite 1.77.1:
* Sort save-game list alphabetically
* Slightly lengthen deadlines on parcel contracts to avoid impossible ones
* Prevent docking with dead stations
* Fix memory leaks.
* Remove "performBroadside" AI command
* Fix scanner display bug
* Display correct key in 'pause' message
* Fix rotational_velocity for subentities
* Fix shipEnergyBecameFull event to fire as documented
-------------------------------------------------------------------------------

2
Resources/Scripts/oolite-cloaking-device-mission.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-cloaking-device";
this.author = "Jens Ayton";
this.copyright = "© 2007-2013 the Oolite team.";
this.description = "Cloaking device mission in galaxy 5.";
this.version = "1.77.1";
this.version = "1.79";
this.startUp = function ()

2
Resources/Scripts/oolite-cloaking-device-pod.js
View File

@ -36,7 +36,7 @@
this.name = "oolite-cloaking-device-pod";
this.author = "Jens Ayton";
this.copyright = "© 2007-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this.shipWasScooped = function (scooper)

2
Resources/Scripts/oolite-cloaking-device-target-ship.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-cloaking-device-target-ship";
this.author = "Jens Ayton";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this.shipDied = function ()

2
Resources/Scripts/oolite-conditions.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-conditions";
this.author = "cim";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
/* contexts: npc, purchase, scripted, newShip, (loading), (damage), (portable) */

2
Resources/Scripts/oolite-constrictor-hunt-mission.js
View File

@ -37,7 +37,7 @@ MA 02110-1301, USA.
this.name = "oolite-constrictor-hunt";
this.author = "Eric Walch";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this._cleanUp = function ()

2
Resources/Scripts/oolite-constrictor-pilot.js
View File

@ -30,7 +30,7 @@
this.name = "oolite-constrictor-pilot";
this.author = "Eric Walch";
this.copyright = "© 2008-2010 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this.unloadCharacter = function ()

2
Resources/Scripts/oolite-constrictor.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-constrictor";
this.author = "Eric Walch";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
/*

2
Resources/Scripts/oolite-contracts-cargo.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-contracts-cargo";
this.author = "cim";
this.copyright = "© 2012-2013 the Oolite team.";
this.description = "Cargo delivery contracts.";
this.version = "1.77.1";
this.version = "1.79";
/**** Configuration options and API ****/

2
Resources/Scripts/oolite-contracts-helpers.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-contracts-helpers";
this.author = "cim";
this.copyright = "© 2012-2013 the Oolite team.";
this.description = "Helper functions for various contracts.";
this.version = "1.77.1";
this.version = "1.79";
// returns a string containing the necessary number of "hair spaces" to
// pad the currentText string to the specified length in 'em'

2
Resources/Scripts/oolite-contracts-parcels.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-contracts-parcels";
this.author = "cim";
this.copyright = "© 2012-2013 the Oolite team.";
this.description = "Parcel delivery contracts.";
this.version = "1.77.1";
this.version = "1.79";
/**** Configuration options and API ****/

2
Resources/Scripts/oolite-contracts-passengers.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-contracts-passengers";
this.author = "cim";
this.copyright = "© 2012-2013 the Oolite team.";
this.description = "Parcel delivery contracts.";
this.version = "1.77.1";
this.version = "1.79";
/**** Configuration options and API ****/

2
Resources/Scripts/oolite-default-effect-script.js
View File

@ -36,6 +36,6 @@ this.name = "oolite-default-effect-script";
this.author = "cim";
this.copyright = "© 2012-2013 the Oolite team.";
this.description = "Standard script for effects.";
this.version = "1.77.1";
this.version = "1.79";
// this script does not define default behaviours for any handlers.

2
Resources/Scripts/oolite-default-player-script.js
View File

@ -34,4 +34,4 @@ this.name = "oolite-default-player-script";
this.author = "Jens Ayton";
this.description = "Standard script for player ship.";
this.copyright = "© 2007-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";

2
Resources/Scripts/oolite-default-ship-script.js
View File

@ -36,7 +36,7 @@ this.name = "oolite-default-ship-script";
this.author = "Jens Ayton";
this.copyright = "© 2007-2013 the Oolite team.";
this.description = "Standard script for ships.";
this.version = "1.77.1";
this.version = "1.79";
// launch_actions handled on shipSpawned(). For parity with 1.65, launch_actions don’t fire for the main station.

2
Resources/Scripts/oolite-global-prefix.js
View File

@ -46,7 +46,7 @@ MA 02110-1301, USA.
this.name = "oolite-global-prefix";
this.author = "Jens Ayton";
this.copyright = "© 2009-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
(function (special) {

2
Resources/Scripts/oolite-locale-functions.js
View File

@ -35,7 +35,7 @@ MA 02110-1301, USA.
this.name = "oolite-locale-functions";
this.author = "Jens Ayton";
this.copyright = "© 2012-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
(function () {

2
Resources/Scripts/oolite-nova-mission.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-nova";
this.author = "Eric Walch, Jens Ayton, Kaks";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this._endTheMission = function ()

2
Resources/Scripts/oolite-thargoid-plans-mission.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-thargoid-plans";
this.author = "Eric Walch";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this._cleanUp = function ()

2
Resources/Scripts/oolite-thargoid-warship.js
View File

@ -36,7 +36,7 @@ MA 02110-1301, USA.
this.name = "oolite-thargoid-warship";
this.author = "Jens Ayton";
this.copyright = "© 2008-2013 the Oolite team.";
this.version = "1.77.1";
this.version = "1.79";
this.shipDied = function ()

2
Resources/Scripts/oolite-trumbles-mission.js
View File

@ -37,7 +37,7 @@ this.name = "oolite-trumbles";
this.author = "Jens Ayton";
this.copyright = "© 2008-2013 the Oolite team.";
this.description = "Random offers of trumbles.";
this.version = "1.77.1";
this.version = "1.79";
(function () {

2
installers/autopackage/default.x86.apspec
View File

@ -18,7 +18,7 @@ Packager: Konstantinos Sykas <ksykas@gmail.com>
Summary: Oolite is an Elite tribute game that is easily expandable.
URL: http://oolite.aegidian.org
License: GNU GPL version 2
SoftwareVersion: 1.77.1
SoftwareVersion: 1.79
AutopackageTarget: 1.4
# Use 'CPUArchitectures: x86_64' if 'uname -m' gives x86_64
CPUArchitectures: x86

2
installers/autopackage/default.x86_64.apspec
View File

@ -18,7 +18,7 @@ Packager: Konstantinos Sykas <ksykas@gmail.com>
Summary: Oolite is an Elite tribute game that is easily expandable.
URL: http://oolite.aegidian.org
License: GNU GPL version 2
SoftwareVersion: 1.77.1
SoftwareVersion: 1.79
AutopackageTarget: 1.4
# Use 'CPUArchitectures: x86' if 'uname -m' gives i?86 (i.e. consider '?' as a wildcard)
CPUArchitectures: x86_64

2
src/Cocoa/Info-Oolite.plist
View File

@ -60,7 +60,7 @@
<key>CFBundleSignature</key>
<string>Ool8</string>
<key>CFBundleVersion</key>
<string>1.77.1</string>
<string>1.79</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.games</string>
<key>LSMinimumSystemVersionByArchitecture</key>

2
src/Cocoa/oolite-version.xcconfig
View File

@ -1 +1 @@
OOLITE_VERSION=1.77.1
OOLITE_VERSION=1.79

1
src/Core/Entities/Entity.h
View File

@ -269,6 +269,7 @@ enum OOScanClass
- (double) findCollisionRadius;
- (void) drawImmediate:(bool)immediate translucent:(bool)translucent;
- (BOOL) isVisible;
- (BOOL) isInSpace;
- (BOOL) isImmuneToBreakPatternHide;
// For shader bindings.

18
src/Core/Entities/Entity.m
View File

@ -1065,6 +1065,24 @@ static NSString * const kOOLogEntityUpdateError = @"entity.linkedList.update.
}
- (BOOL) isInSpace
{
switch ([self status])
{
case STATUS_IN_FLIGHT:
case STATUS_DOCKING:
case STATUS_LAUNCHING:
case STATUS_WITCHSPACE_COUNTDOWN:
case STATUS_BEING_SCOOPED:
case STATUS_EFFECT:
case STATUS_ACTIVE:
return YES;
default:
return NO;
}
}
- (BOOL) isImmuneToBreakPatternHide
{
return isImmuneToBreakPatternHide;

2
src/Core/HeadUpDisplay.m
View File

@ -2312,7 +2312,7 @@ static OOPolygonSprite *IconForMissileRole(NSString *role)
ShipEntity *secondary = [(OOWeakReference *)sec_id weakRefUnderlyingObject];
if (secondary != nil && secondary != primary)
{
if ([secondary zeroDistance] <= SCANNER_MAX_RANGE2)
if ([secondary zeroDistance] <= SCANNER_MAX_RANGE2 && [secondary isInSpace])
{
hudDrawReticleOnTarget(secondary, PLAYER, z1, alpha, NO, nil, YES, NO);
}

15
src/Core/Scripting/OOJSEntity.m
View File

@ -241,20 +241,7 @@ static JSBool EntityGetProperty(JSContext *context, JSObject *this, jsid propID,
return YES;
case kEntity_isInSpace:
switch ([entity status])
{
case STATUS_IN_FLIGHT:
case STATUS_DOCKING:
case STATUS_LAUNCHING:
case STATUS_WITCHSPACE_COUNTDOWN:
case STATUS_BEING_SCOOPED:
case STATUS_EFFECT:
case STATUS_ACTIVE:
*value = JSVAL_TRUE;
break;
default:
*value = JSVAL_FALSE;
}
*value = OOJSValueFromBOOL([entity isInSpace]);
return YES;
case kEntity_isShip: