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

Removed duplicate strings in descriptions.plist (change in translation string name)

Browse Source 
Some txt updates (porting & readme_linux in particular might well need to be further updated)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4208 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Marc 2011-02-01 20:15:52 +00:00
parent 4ade099cec
commit 62fb7e8aa0
7 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Doc/PORTING.TXT
View File

@ -4,9 +4,7 @@ Porting Oolite
Oolite is portable to any platform that supports SDL and GNUstep. It is Oolite is portable to any platform that supports SDL and GNUstep. It is
known to run on Linux, FreeBSD 5 and 6 and SGI IRIX. (The OS X version known to run on Linux, FreeBSD 5 and 6 and SGI IRIX. (The OS X version
is the 'canonical' version - Oolite appeared on Mac OS X first and was is the 'canonical' version - Oolite appeared on Mac OS X first and was
later ported). It is also known to run under Windows, however the later ported). It also runs under Windows.
Windows port is currently at alpha test level (GNUstep on Windows isn't
as complete as it is on Unix).
Oolite doesn't care about the endian-ness of the architecture - so far, Oolite doesn't care about the endian-ness of the architecture - so far,
it is known to have run on PowerPC, Intel/amd x86, amd x86_64 (and it is known to have run on PowerPC, Intel/amd x86, amd x86_64 (and
@ -30,22 +28,22 @@ contain the following:
In the root: In the root:
install A shell script that installs Oolite on the user's computer install A shell script that installs Oolite on the user's computer.
oolite.src A shell script fragment that is used to make the shell oolite.src A shell script fragment that is used to make the shell
script 'oolite' that runs the game. script 'oolite' that runs the game.
oolite-update.src A shell script fragment that can rsync updates. oolite-update.src A shell script fragment that can rsync updates.
PLAYING.TXT Brief players guid OoliteReadMe.pdf Brief players guide.
README.TXT Readme for your platform OoliteRS.pdf Players Reference Sheet.
README.TXT Readme for your platform.
Subdirectories: Subdirectories:
oolite-deps oolite-deps
GNUstep A minimalist set of GNUstep run time files GNUstep A minimalist set of GNUstep run time files
lib Shared libraries that support the game lib Shared libraries that support the game
If your platform does not yet have this dependencies directory, you can If your platform does not yet have this dependencies directory, you can
model yours on the Linux-deps directory. Most things will be the model yours on the Linux-deps directory. Most things will be the
same. (The reason PLAYING.TXT is here is that it may vary slightly from same.
platform to platform).
Issues you may encounter when building Oolite on a new platform Issues you may encounter when building Oolite on a new platform
=============================================================== ===============================================================

19
Doc/README_LINUX.TXT
View File

@ -25,9 +25,8 @@ PATH=$PATH:.
before running make when you build GNUstep Startup, because it depends before running make when you build GNUstep Startup, because it depends
on running a shell script in the current directory. on running a shell script in the current directory.
I'm not sure what the minimum hardware is, however decent OpenGL Hardware OpenGL support is a must. Oolite linux was tested on the
support is a must. I've only been able to personally test it on following machines - a 2GHz P4 with a GeForce 4ti and an old Compaq
two machines - a 2GHz P4 with a GeForce 4ti and an old Compaq
733MHz P3 with ATi Radeon Mobility. It ran fine on both machines. 733MHz P3 with ATi Radeon Mobility. It ran fine on both machines.
I have heard reports of bad things happening with ATi graphics I have heard reports of bad things happening with ATi graphics
cards, but only off one person (textures didn't display), and another cards, but only off one person (textures didn't display), and another
@ -74,8 +73,8 @@ have one, screenshots, and describe weirdness with sound. Also provide
log messages from the console. Better still, if you have a fix, send log messages from the console. Better still, if you have a fix, send
us the patch! us the patch!
Modifications from Stock OSX Oolite Modifications from OSX Oolite
=================================== =============================
Makefiles: Makefiles:
GNUmakefile and GNUmakefile.postamble. GNUmakefile and GNUmakefile.postamble.
@ -89,7 +88,7 @@ PlayerEntity_Additions.m, PlayerEntity_contracts.m, ShipEntity_AI.m -
If you grep for these, you can see where work has to be done. If you grep for these, you can see where work has to be done.
I've usually put a TODO: comment line in these (many of them are not I've usually put a TODO: comment line in these (many of them are not
filled in). I've not #ifdef'd out any methods - I've left at least filled in). I've not #ifdef'd out any methods - I've left at least
a stub if there's nothing to put in there (for example, speech). a stub if there's nothing to put in there .
Addition of Comparison.m/h from ObjectiveLib Addition of Comparison.m/h from ObjectiveLib
(see http://objectivelib.sourceforge.net). ObjectiveLib is an LGPL'd (see http://objectivelib.sourceforge.net). ObjectiveLib is an LGPL'd
@ -103,14 +102,6 @@ to just add these two files.
Sound uses SDL instead of the AppKit's sound (the sound daemon crashes). Sound uses SDL instead of the AppKit's sound (the sound daemon crashes).
Graphics use SDL instead of NSOpenGLView. Graphics use SDL instead of NSOpenGLView.
Major tasks left
================
- Get rid of AppKit dependencies (in progress; moving to SDL). This
will make the game portable to more platforms - in particular,
GNUstep AppKit's OpenGL source is non-existent on Redmondware.
Much of this work has been done.
- Speech. This is a more 'who cares?' requirement. I don't know of
a *nix open source speech synth.
Notes for the terminally insane Notes for the terminally insane
=============================== ===============================

20
Doc/Version-bump.txt
View File

@ -1,12 +1,6 @@
Major versions: Prior to release:
Doc/OoliteReadMe.doc
Doc/OoliteReadMe.pdf
http://wiki.alioth.net/index.php/Oolite_Instruction_Manual#Playing_the_game
http://wiki.alioth.net/index.php/Pilot%27s_Reference_Manual
Doc/ReadMe.rtfd
DebugOXP/Resources/oolite-debug-console.js
Minor versions: - Minor & Major versions:
installers/autopackage/default.x86.apspec installers/autopackage/default.x86.apspec
installers/autopackage/default.x86_64.apspec installers/autopackage/default.x86_64.apspec
debian/changelog.in debian/changelog.in
@ -15,7 +9,17 @@ src/Cocoa/oolite-version.plist
Resources/Scripts/* Resources/Scripts/*
Resources/InfoPlist.strings (note: UTF-16) Resources/InfoPlist.strings (note: UTF-16)
- Major versions:
Doc/OoliteReadMe.doc
Doc/OoliteReadMe.pdf
http://wiki.alioth.net/index.php/Oolite_Instruction_Manual#Playing_the_game
http://wiki.alioth.net/index.php/Pilot%27s_Reference_Manual
Doc/ReadMe.rtfd
DebugOXP/Resources/oolite-debug-console.js
On release: On release:
http://www.oolite.org/download (current version six times, previous version for Windows updater once) http://www.oolite.org/download (current version six times, previous version for Windows updater once)
Topic of #oolite Topic of #oolite
latest news at berlios.de latest news at berlios.de

8
Resources/Config/descriptions.plist
View File

@ -968,15 +968,15 @@
"equipment-@-not-available" = "%@ (N/A)"; "equipment-@-not-available" = "%@ (N/A)";
"manifest-cargo-quantity-format" = "%d %@ × %@"; // $count $units × $commodityName "manifest-cargo-quantity-format" = "%d %@ × %@"; // $count $units × $commodityName
// Short and Long Range Chart Screens
"charts-distance-f" = "Distance: %.1f Light Years";
"charts-est-travel-time-f" = "Estimated Travel Time: %.1f Hours";
// Short Range Chart Screen // Short Range Chart Screen
"short-range-chart-title" = "Short Range Chart"; "short-range-chart-title" = "Short Range Chart";
"short-range-chart-distance-f" = "Distance: %.1f Light Years";
"short-range-chart-est-travel-time-f" = "Estimated Travel Time: %.1f Hours";
// Long Range Chart Screen // Long Range Chart Screen
"long-range-chart-title-d" = "Galactic Chart %d"; "long-range-chart-title-d" = "Galactic Chart %d";
"long-range-chart-distance-f" = "Distance: %.1f Light Years";
"long-range-chart-est-travel-time-f" = "Estimated Travel Time: %.1f Hours";
"long-range-chart-find-planet-@" = "Find planet: %@"; "long-range-chart-find-planet-@" = "Find planet: %@";
"long-range-chart-system-unreachable" = "System Unreachable"; "long-range-chart-system-unreachable" = "System Unreachable";

15
Resources/README.TXT
View File

@ -1,10 +1,15 @@
oolite-data oolite-data
=========== ===========
This contains all the data that oolite needs when you run it - sounds, This resources folder contains all the data that oolite needs when you run it - sounds,
textures etc. It is distributed separately to the source since textures, default settings, etc.
the source is changing MUCH more frequently than the data, and it makes
for massive source downloads if the data is included.
Unpack this directory in your oolite source dir before you build. To modify sounds, textures and settings, use the AddOns directory, rather than modify
these files directly. For more information on how to do so, follow the guidelines found
at the following URL:
http://wiki.alioth.net/index.php/OXP_howto
Or ask on Oolite's Bulletin Board:
http://aegidian.org/bb/

4
src/Core/Entities/PlayerEntity.m
View File

@ -5612,8 +5612,8 @@ done:
[gui clearAndKeepBackground:!guiChanged]; [gui clearAndKeepBackground:!guiChanged];
[gui setTitle:DESC(@"short-range-chart-title")]; [gui setTitle:DESC(@"short-range-chart-title")];
[gui setText:targetSystemName forRow:19]; [gui setText:targetSystemName forRow:19];
[gui setText:[NSString stringWithFormat:DESC(@"short-range-chart-distance-f"), distance] forRow:20]; [gui setText:[NSString stringWithFormat:DESC(@"charts-distance-f"), distance] forRow:20];
if ([self hasHyperspaceMotor]) [gui setText:((distance > 0.0 && distance <= (double)fuel/10.0) ? (NSString *)[NSString stringWithFormat:DESC(@"short-range-chart-est-travel-time-f"), estimatedTravelTime] : (NSString *)@"") forRow:21]; if ([self hasHyperspaceMotor]) [gui setText:(NSString *)((distance > 0.0 && distance <= (double)fuel/10.0) ? [NSString stringWithFormat:DESC(@"charts-est-travel-time-f"), estimatedTravelTime] : @"") forRow:21];
[gui setShowTextCursor:NO]; [gui setShowTextCursor:NO];
} }
/* ends */ /* ends */

4
src/Core/GuiDisplayGen.m
View File

@ -1603,11 +1603,11 @@ static OOTextureSprite *NewTextureSpriteWithDescriptor(NSDictionary *descriptor)
if (routeExists) if (routeExists)
{ {
[self setText:[NSString stringWithFormat:DESC(@"long-range-chart-distance-f"), distance] forRow:18]; [self setText:[NSString stringWithFormat:DESC(@"charts-distance-f"), distance] forRow:18];
NSString *travelTimeLine = @""; NSString *travelTimeLine = @"";
if (advancedNavArrayMode != OPTIMIZED_BY_NONE && distance > 0) if (advancedNavArrayMode != OPTIMIZED_BY_NONE && distance > 0)
{ {
travelTimeLine = [NSString stringWithFormat:DESC(@"long-range-chart-est-travel-time-f"), time]; travelTimeLine = [NSString stringWithFormat:DESC(@"charts-est-travel-time-f"), time];
} }
[self setText:travelTimeLine forRow:19]; [self setText:travelTimeLine forRow:19];
} }