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

remove lighting-fix-tentative user default

Browse Source
This commit is contained in:
Kevin Anthoney 2015-05-23 17:03:30 +01:00
commit bc3eb9df4a
12 changed files with 118 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Doc/CHANGELOG.TXT
View File

@ -317,6 +317,7 @@ Bug fixes:
bounty fixed.
* Fix error with cargo dumping when reloading save after death
* Fix NPC turret aim
* Some OXZ manager bugs related to duplicate manifest IDs fixed
-------------------------------------------------------------------------------

BIN
Doc/OoliteRS.odt
View File

Binary file not shown.

BIN
Doc/OoliteRS.pdf
View File

Binary file not shown.

1
Doc/contributors.txt
View File

@ -27,6 +27,7 @@ Lazygun
Dave MacLachlan (Jester)
Steve Murphy (Capt. Murphy)
Chris Morris (cim)
Norbert Nagy (Norby)
Neil (ZygoUgo)
Nic
No Sleep Nigel

18
Oolite.xcodeproj/project.pbxproj
View File

@ -542,6 +542,10 @@
25F4676509969672009483BF /* MyOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 25F4676309969672009483BF /* MyOpenGLView.m */; };
2B4CDFEC107B3D8400526C98 /* OOJSManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B4CDFEA107B3D8400526C98 /* OOJSManifest.h */; };
2B4CDFED107B3D8400526C98 /* OOJSManifest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4CDFEB107B3D8400526C98 /* OOJSManifest.m */; };
4F1F155D1B0FCB11001C1591 /* OOCheckPListSyntaxVerifierStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1F155C1B0FCB11001C1591 /* OOCheckPListSyntaxVerifierStage.m */; };
4F1F155F1B0FCB76001C1591 /* OOCheckPListSyntaxVerifierStage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1F155E1B0FCB76001C1591 /* OOCheckPListSyntaxVerifierStage.h */; };
4F1F15611B0FCBFA001C1591 /* OOCheckJSSyntaxVerifierStage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F1F15601B0FCBFA001C1591 /* OOCheckJSSyntaxVerifierStage.m */; };
4F1F15631B0FCC17001C1591 /* OOCheckJSSyntaxVerifierStage.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1F15621B0FCC17001C1591 /* OOCheckJSSyntaxVerifierStage.h */; };
B33A44F1199E6745000B45AE /* OOOpenGLMatrixManager.h in Headers */ = {isa = PBXBuildFile; fileRef = B33A44EF199E6745000B45AE /* OOOpenGLMatrixManager.h */; };
B33A44F2199E6745000B45AE /* OOOpenGLMatrixManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B33A44F0199E6745000B45AE /* OOOpenGLMatrixManager.m */; };
B3B46C871A0D053D00D6C39B /* OOSystemDescriptionManager.h in Copy Plug-ins */ = {isa = PBXBuildFile; fileRef = B3B46C851A0D053D00D6C39B /* OOSystemDescriptionManager.h */; };
@ -1457,7 +1461,7 @@
1A9406820BAF66D6005F6CF3 /* OOVoxel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOVoxel.h; sourceTree = "<group>"; };
1A9406830BAF66D6005F6CF3 /* OOVoxel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOVoxel.m; sourceTree = "<group>"; };
1A9406B20BAF67BF005F6CF3 /* OOTriangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOTriangle.h; sourceTree = "<group>"; };
1A9407BF0BAF7032005F6CF3 /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; usesTabs = 0; xcLanguageSpecificationIdentifier = xcode.lang.make; };
1A9407BF0BAF7032005F6CF3 /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; usesTabs = 0; };
1A9438CD17F84C560011F80B /* OOExplosionCloudEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOExplosionCloudEntity.h; sourceTree = "<group>"; };
1A9438CE17F84C560011F80B /* OOExplosionCloudEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOExplosionCloudEntity.m; sourceTree = "<group>"; };
1A94E4FB0F348D4300F1B5D9 /* delayedReactToAttackAI.plist */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = delayedReactToAttackAI.plist; sourceTree = "<group>"; };
@ -1682,6 +1686,10 @@
2B4CDFEA107B3D8400526C98 /* OOJSManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOJSManifest.h; sourceTree = "<group>"; };
2B4CDFEB107B3D8400526C98 /* OOJSManifest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOJSManifest.m; sourceTree = "<group>"; };
2B9A1088105D526200EE2AE6 /* javascript-errors.plist */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = "javascript-errors.plist"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
4F1F155C1B0FCB11001C1591 /* OOCheckPListSyntaxVerifierStage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOCheckPListSyntaxVerifierStage.m; sourceTree = "<group>"; };
4F1F155E1B0FCB76001C1591 /* OOCheckPListSyntaxVerifierStage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOCheckPListSyntaxVerifierStage.h; sourceTree = "<group>"; };
4F1F15601B0FCBFA001C1591 /* OOCheckJSSyntaxVerifierStage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOCheckJSSyntaxVerifierStage.m; sourceTree = "<group>"; };
4F1F15621B0FCC17001C1591 /* OOCheckJSSyntaxVerifierStage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOCheckJSSyntaxVerifierStage.h; sourceTree = "<group>"; };
B33A44EF199E6745000B45AE /* OOOpenGLMatrixManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OOOpenGLMatrixManager.h; sourceTree = "<group>"; };
B33A44F0199E6745000B45AE /* OOOpenGLMatrixManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OOOpenGLMatrixManager.m; sourceTree = "<group>"; };
B3460D4315285BDE002592D0 /* oolite-default-planet.fragment */ = {isa = PBXFileReference; explicitFileType = sourcecode.glsl; fileEncoding = 4; path = "oolite-default-planet.fragment"; sourceTree = "<group>"; };
@ -3003,6 +3011,10 @@
1AB2AAE70C4CDF890008CF4E /* OXP Verification */ = {
isa = PBXGroup;
children = (
4F1F15621B0FCC17001C1591 /* OOCheckJSSyntaxVerifierStage.h */,
4F1F15601B0FCBFA001C1591 /* OOCheckJSSyntaxVerifierStage.m */,
4F1F155E1B0FCB76001C1591 /* OOCheckPListSyntaxVerifierStage.h */,
4F1F155C1B0FCB11001C1591 /* OOCheckPListSyntaxVerifierStage.m */,
1AB2AB120C4CE4070008CF4E /* verifyOXP.plist */,
1AB2AAF80C4CE0CC0008CF4E /* OOOXPVerifier.h */,
1AB2AAF90C4CE0CC0008CF4E /* OOOXPVerifier.m */,
@ -3334,6 +3346,7 @@
1A71D8AB0E5F17410088C456 /* OOSoundSource.h in Headers */,
1A7B967F0E620C9E00322821 /* OOSoundInternal.h in Headers */,
1A8BB8EA0E8311F900122974 /* OONullTexture.h in Headers */,
4F1F15631B0FCC17001C1591 /* OOCheckJSSyntaxVerifierStage.h in Headers */,
1AB812900E90179D00A84923 /* TextureStore.h in Headers */,
1AB8130A0E90D8E500A84923 /* OOLogOutputHandler.h in Headers */,
1AC27A0F0EA7E9940054E5F0 /* OOJSEquipmentInfo.h in Headers */,
@ -3382,6 +3395,7 @@
1A1F7DB7117B5D8200332757 /* OOMaterialSpecifier.h in Headers */,
1A19783E117F81B10060DB56 /* OOPixMapChannelOperations.h in Headers */,
1A95C040118A450E002EE302 /* OOConvertCubeMapToLatLong.h in Headers */,
4F1F155F1B0FCB76001C1591 /* OOCheckPListSyntaxVerifierStage.h in Headers */,
1ACB1D18118DCBC0007B9A1F /* OOConcreteTexture.h in Headers */,
1ACB1D1C118DCE5A007B9A1F /* OOTextureInternal.h in Headers */,
1AEB491A119D5AAA007BD514 /* OORegExpMatcher.h in Headers */,
@ -3840,6 +3854,7 @@
1AA82C8A0CC10E700023B797 /* OOJSWorldScripts.m in Sources */,
1A7C75C30CC39EC3005D0AA2 /* OOJSSun.m in Sources */,
1AD1F4FF0CD9E83700EAE520 /* NSThreadOOExtensions.m in Sources */,
4F1F155D1B0FCB11001C1591 /* OOCheckPListSyntaxVerifierStage.m in Sources */,
1A69FFF818A64CF70062EAC8 /* OOJoystickProfile.m in Sources */,
1AC545070D4D228400C90E5B /* OOEncodingConverter.m in Sources */,
1A28AA170D55438200BC0CE4 /* OOJSSound.m in Sources */,
@ -3927,6 +3942,7 @@
1AC0F29E12E1DADC00ECBBB0 /* OOJSEngineDebuggerHelpers.m in Sources */,
1A35257312E1FFA900244C9D /* OOConstToJSString.m in Sources */,
1A127F4412EC6A4400B65D9F /* OOTextureSprite.m in Sources */,
4F1F15611B0FCBFA001C1591 /* OOCheckJSSyntaxVerifierStage.m in Sources */,
1A1280F912ECA4ED00B65D9F /* OOJSFont.m in Sources */,
1AE7325112F75D470045513D /* OOLaserShotEntity.m in Sources */,
1A97D77F12FDBB9B0009D74A /* OOQuiriumCascadeEntity.m in Sources */,

21
Resources/Config/shipdata.plist
View File

@ -3615,16 +3615,16 @@
emission_modulate_color = (0.9926, 0.9686, 0.7325, 1.0);
};
"Engine" =
{
diffuse_map = "oolite_viper_diffuse.png";
specular_color = (0.6, 0.5, 0.5 );
shininess = 9;
};
{
diffuse_map = "oolite_viper_diffuse.png";
specular_color = (0.6, 0.5, 0.5 );
shininess = 9;
emission_map =
{
name = "oolite_viper_diffuse.png"; extract_channel = "a";
};
emission_modulate_color = (0.7325, 0.9686, 0.9926, 1.0);
};
};
max_energy = 180;
max_flight_pitch = 1.8;
@ -3873,6 +3873,17 @@
};
emission_modulate_color = (0.7325, 0.9686, 0.9926, 1.0);
};
"Engine" =
{
diffuse_map = "oolite_viper_diffuse_pursuit.png";
specular_color = (0.6, 0.5, 0.5 );
shininess = 9;
emission_map =
{
name = "oolite_viper_diffuse_pursuit.png"; extract_channel = "a";
};
emission_modulate_color = (0.7325, 0.9686, 0.9926, 1.0);
};
};
roles = "wingman";
thrust = 36;

2
deps/Linux-deps vendored

@ -1 +1 @@
Subproject commit 341a3d978bec1c72d686bd8c0c2099e36a92936f
Subproject commit 2c9bebdf8bde8ff5890f8ec29bcc44d06c85e5e9

10
src/Core/Entities/OOPlanetEntity.m
View File

@ -565,7 +565,12 @@ static OOColor *ColorWithHSBColor(Vector c)
}
// 500km squared
if (magnitude2(cameraRelativePosition) > 250000000000.0)
// if (magnitude2(cameraRelativePosition) > 250000000000.0)
/* Temporarily for 1.82 make this branch unconditional. There's an
* odd change in appearance when crossing this boundary, which can
* be quite noticeable. There don't appear to be close-range
* problems with doing it this way all the time, though it's not
* ideal. - CIM */
{
/* at this distance the atmosphere is too close to the planet
* for a 24-bit depth buffer to reliably distinguish the two,
@ -580,6 +585,7 @@ static OOColor *ColorWithHSBColor(Vector c)
OOGLPopModelView();
}
}
#if OOLITE_HAVE_FIXED_THE_ABOVE_DESCRIBED_BUG_WHICH_WE_HAVENT
else
{
/* At close range we can do this properly and draw the
@ -599,7 +605,7 @@ static OOColor *ColorWithHSBColor(Vector c)
[_planetDrawable renderOpaqueParts];
}
}
#endif
if ([UNIVERSE wireframeGraphics]) OOGLWireframeModeOff();
}

4
src/Core/HeadUpDisplay.m
View File

@ -398,13 +398,13 @@ OOINLINE void GLColorWithOverallAlpha(const GLfloat *color, GLfloat alpha)
{
[gui printLongText:[lastLines oo_stringAtIndex:0] align:GUI_ALIGN_CENTER
color:[OOColor colorFromString:[lastLines oo_stringAtIndex:1]]
fadeTime:(permanent?[lastLines oo_floatAtIndex:2]:0.0) key:nil addToArray:nil];
fadeTime:(permanent?0.0:[lastLines oo_floatAtIndex:2]) key:nil addToArray:nil];
}
if ([lastLines count] > 3 && (line1 || ![[lastLines oo_stringAtIndex:3] isEqualToString:@""]))
{
[gui printLongText:[lastLines oo_stringAtIndex:3] align:GUI_ALIGN_CENTER
color:[OOColor colorFromString:[lastLines oo_stringAtIndex:4]]
fadeTime:(permanent?[lastLines oo_floatAtIndex:5]:0.0) key:nil addToArray:nil];
fadeTime:(permanent?0.0:[lastLines oo_floatAtIndex:5]) key:nil addToArray:nil];
}
}

1
src/Core/OOCommodities.m
View File

@ -166,6 +166,7 @@ MA 02110-1301, USA.
good = [NSMutableDictionary dictionaryWithDictionary:[_commodityLists oo_dictionaryForKey:commodity]];
[good oo_setUnsignedInteger:0 forKey:kOOCommodityPriceCurrent];
[good oo_setUnsignedInteger:0 forKey:kOOCommodityQuantityCurrent];
[good oo_setUnsignedInteger:0 forKey:kOOCommodityCapacity];
[good setObject:commodity forKey:kOOCommodityKey];
[market setGood:commodity withInfo:good];

90
src/Core/OOOXZManager.m
View File

@ -646,12 +646,24 @@ static OOOXZManager *sSingleton = nil;
[adjManifest setObject:fullpath forKey:kOOManifestFilePath];
NSDictionary *stored = nil;
/* The list is already sorted to put the latest
* versions first. This flag means that it stops
* checking the list for versions once it finds one
* that is plausibly installable */
BOOL foundInstallable = NO;
foreach (stored, _oxzList)
{
if ([[stored oo_stringForKey:kOOManifestIdentifier] isEqualToString:[manifest oo_stringForKey:kOOManifestIdentifier]])
{
[adjManifest setObject:[stored oo_stringForKey:kOOManifestVersion] forKey:kOOManifestAvailableVersion];
[adjManifest setObject:[stored oo_stringForKey:kOOManifestDownloadURL] forKey:kOOManifestDownloadURL];
if (foundInstallable == NO)
{
[adjManifest setObject:[stored oo_stringForKey:kOOManifestVersion] forKey:kOOManifestAvailableVersion];
[adjManifest setObject:[stored oo_stringForKey:kOOManifestDownloadURL] forKey:kOOManifestDownloadURL];
if ([ResourceManager checkVersionCompatibility:manifest forOXP:nil])
{
foundInstallable = YES;
}
}
}
}
@ -793,6 +805,9 @@ static OOOXZManager *sSingleton = nil;
// it was unmet, but now it's met
[_dependencyStack removeObject:requirement];
OOLog(kOOOXZDebugLog,@"Dependency stack: requirement met");
} else if ([[requirement oo_stringForKey:kOOManifestRelationIdentifier] isEqualToString:[downloadedManifest oo_stringForKey:kOOManifestIdentifier]]) {
// remove the requirement for the just downloaded OXP
[_dependencyStack removeObject:requirement];
}
}
}
@ -812,30 +827,62 @@ static OOOXZManager *sSingleton = nil;
{
// get an object from the requirements list, and download it
// if it can be found
requirement = [_dependencyStack anyObject];
OOLog(kOOOXZDebugLog,@"Dependency stack: next is %@",[requirement oo_stringForKey:kOOManifestRelationIdentifier]);
if (!_downloadAllDependencies)
{
[progress appendString:DESC(@"oolite-oxzmanager-progress-get-required")];
}
NSString *needsIdentifier = [requirement oo_stringForKey:kOOManifestRelationIdentifier];
BOOL undownloadedRequirement = NO;
NSDictionary *availableDownload = nil;
BOOL foundDownload = NO;
NSUInteger index = 0;
foreach (availableDownload, _oxzList)
NSString *needsIdentifier = nil;
do
{
if ([[availableDownload oo_stringForKey:kOOManifestIdentifier] isEqualToString:needsIdentifier])
undownloadedRequirement = YES;
requirement = [_dependencyStack anyObject];
OOLog(kOOOXZDebugLog,@"Dependency stack: next is %@",[requirement oo_stringForKey:kOOManifestRelationIdentifier]);
if (!_downloadAllDependencies)
{
if ([ResourceManager matchVersions:requirement withVersion:[availableDownload oo_stringForKey:kOOManifestVersion]])
[progress appendString:DESC(@"oolite-oxzmanager-progress-get-required")];
}
needsIdentifier = [requirement oo_stringForKey:kOOManifestRelationIdentifier];
foreach (availableDownload, _oxzList)
{
if ([[availableDownload oo_stringForKey:kOOManifestIdentifier] isEqualToString:needsIdentifier])
{
OOLog(kOOOXZDebugLog,@"Dependency stack: found download for next item");
foundDownload = YES;
index = [_oxzList indexOfObject:availableDownload];
break;
if ([ResourceManager matchVersions:requirement withVersion:[availableDownload oo_stringForKey:kOOManifestVersion]])
{
OOLog(kOOOXZDebugLog,@"Dependency stack: found download for next item");
foundDownload = YES;
index = [_oxzList indexOfObject:availableDownload];
break;
}
}
}
if (foundDownload)
{
if ([self installableState:[_oxzList objectAtIndex:index]] == OXZ_UNINSTALLABLE_ALREADY)
{
OOLog(kOOOXZDebugLog,@"Dependency stack: %@ is downloaded but not yet loadable, removing from list.",[requirement oo_stringForKey:kOOManifestRelationIdentifier]);
// then this has already been downloaded, but
// can't be configured yet presumably because
// another dependency is still to be loaded
[_dependencyStack removeObject:requirement];
if ([_dependencyStack count] > 0)
{
// try again
undownloadedRequirement = NO;
}
else
{
// this case should probably never happen
// is handled below just in case
foundDownload = NO;
}
}
}
}
while (!undownloadedRequirement);
if (foundDownload)
{
@ -845,7 +892,7 @@ static OOOXZManager *sSingleton = nil;
_downloadStatus = OXZ_DOWNLOAD_NONE;
if (_downloadAllDependencies)
{
OOLog(kOOOXZDebugLog,@"Dependency stack: installing %lu from list",index);
OOLog(kOOOXZDebugLog,@"Dependency stack: installing %lu from list",index);
if (![self installOXZ:index]) {
// if a required dependency is somehow uninstallable
// e.g. required+maximum version don't match this Oolite
@ -868,7 +915,8 @@ static OOOXZManager *sSingleton = nil;
[self gui];
return YES;
}
else
// this is probably always the case, see above
else if ([_dependencyStack count] > 0)
{
[progress appendFormat:DESC(@"oolite-oxzmanager-progress-required-@-not-found"),[requirement oo_stringForKey:kOOManifestRelationDescription defaultValue:[requirement oo_stringForKey:kOOManifestRelationIdentifier]]];
[self setProgressStatus:progress];
@ -956,7 +1004,9 @@ static OOOXZManager *sSingleton = nil;
{
if (installed != nil)
{
if (CompareVersions(ComponentsFromVersionString([installed oo_stringForKey:kOOManifestVersion]),ComponentsFromVersionString([installed oo_stringForKey:kOOManifestAvailableVersion])) == NSOrderedDescending)
OOLog(@"version.debug",@"%@ mv:%@ mav:%@",identifier,[installed oo_stringForKey:kOOManifestVersion],[manifest oo_stringForKey:kOOManifestVersion]);
// if (CompareVersions(ComponentsFromVersionString([installed oo_stringForKey:kOOManifestVersion]),ComponentsFromVersionString([installed oo_stringForKey:kOOManifestAvailableVersion])) == NSOrderedDescending)
if (CompareVersions(ComponentsFromVersionString([installed oo_stringForKey:kOOManifestVersion]),ComponentsFromVersionString([manifest oo_stringForKey:kOOManifestVersion])) == NSOrderedDescending)
{
// the installed copy is more recent than the server copy
return OXZ_UNINSTALLABLE_NOREMOTE;

2
src/Core/Scripting/OOJSSystem.m
View File

@ -1555,7 +1555,7 @@ static BOOL GetRelativeToAndRange(JSContext *context, NSString *methodName, uint
// Get optional argument relativeTo : Entity
if (*ioArgc != 0)
{
if (EXPECT_NOT(!JSValueToEntity(context, **ioArgv, outRelativeTo)))
if (EXPECT_NOT(JSVAL_IS_NULL(**ioArgv) || !JSValueToEntity(context, **ioArgv, outRelativeTo)))
{
OOJSReportBadArguments(context, @"System", methodName, 1, *ioArgv, nil, @"entity");
return NO;