148 Commits

Author SHA1 Message Date
Marc
40184ebb0c Duplicate strings part II: restored the previous translation strings. Distance and estimated travel time strings can now be overridden globally, or assume separate values depending on which chart is displayed! :)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4211 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-02 09:53:03 +00:00
Marc
62fb7e8aa0 Removed duplicate strings in descriptions.plist (change in translation string name)
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
2011-02-01 20:15:52 +00:00
Jens Ayton
bb8ee9280d Work on scriptable number formatting for localization. (If this seems like overkill, you probably haven’t considered the problem in enough detail.) Currently supports integers and credits quantities, and is used for displaying credits quantites in UI.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4112 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-21 01:00:25 +00:00
Jens Ayton
b5a207c598 Comm log messages are now spoken. (Feature request #4970)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4039 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-09 14:18:29 +00:00
Jens Ayton
473e4e5c5e Mac startup messages now reflect reality, and are more fine-grained in debug builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3976 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 17:25:11 +00:00
Marc
cb89afc4d4 Copyright date bonanza! Most - if not all - copyright notices are now updated to 2011.
Minor code cleanup:
- graphically cleaner windows resize for SDL systems.
- world event shipWillExit/ExitedWitchspace now also triggered if the escape capsule is rescued at a different system (via OXP override).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3965 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 02:16:03 +00:00
Jens Ayton
5bf81d659d Joystick code cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3877 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:16:44 +00:00
Jens Ayton
3a463348bb Joystick refactoring.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 14:56:39 +00:00
Nikos Barkas
e14168201a Enabled ability to take snapshot using joystick button assignment.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3844 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-11 21:44:29 +00:00
getafix
f2b95b7606 Added the escape pod entry in the joystick configuration menu,
following to the changes introduced in r3808.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3818 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-15 23:10:31 +00:00
Marc
b3647b67bc escape pods part II:
- player and NPCs can eject at all times now.
- if pod ejected in witchspace, it's game over for the player, unless overridden by oxp.
- if pod ejected in normal space, the player will always reappear at the main station, unless overridden by oxp!
- new worldScript event 'escapePodSequenceOver' to override escape pod behaviour: if at the end of the event player.ship.target is a dockable station, the player will reappear inside it, otherwise game over!
- new translation string: gameover-escape-pod

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3809 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-13 20:10:05 +00:00
Nikos Barkas
f81cfc21ae Implemented the allowsAutoDocking property for stations and made it visible and read/write to scripts. Defaults to YES.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3805 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-12 18:20:22 +00:00
Marc
ec4a512194 * Primable equipment! Use shift-n to select, and n to activate the equipment.
- New primed equipment key in savegames.
- Equipment scripts only respond to the activate event.
- Equipment scripts have access to this.equipmentKey, which contains the equipment type the script is associated to (e.g. 'EQ_WHATEVER')
* More commsMessage stuff:
- new parameter: ship.commsMessage(message [, toShip]) the second - optional - parameter now allows for narrowcast, as opposed to generic broadcast within scanner range - in crowded systems it's faster to narrowcast to a couple of ships, than to just broadcast the message to all ships in range!
- commsMessageReceived event: the ship sending the message is now passed as a second parameter to the event handler.
* new equipmentInfo property: scriptName
* new ship property: isPiloted
* assorted code cleanup...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3799 127b21dd-08f5-0310-b4b7-95ae10353056
2010-11-10 21:49:23 +00:00
Michael Werle
c085bcdd2b Autopilot controls revamp, as discussed.
- c now tries to dock either at the players' current target, a nearby station, or the system main station.
 - Shift-C does the same, except attempts a fast-dock if the station allows it.
Added a new key 'allowsFastDocking'. Defaults to YES for the system main station, and NO to all other stations.
 - Shift-D is no longer used.
Also, autopilot will no longer engage on Condition Red.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3783 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-28 19:55:35 +00:00
Nikos Barkas
8f6c69079f Weapons online/offline toggle control can now be assigned to joystick button too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3776 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-22 22:30:09 +00:00
Nikos Barkas
05694cebdc Implemented weapons lockdown toggle. Defaults to '_' and the weapons online/offline status is saved in the player's savefile. Affects lasers, missiles, mines and energy bomb.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3774 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-21 09:27:33 +00:00
Eric Walch
97733ee069 - added report messages for pilots that have both a bounty and an insurance.
- ships that become a hulk are now removed from any group they belonged to.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3766 127b21dd-08f5-0310-b4b7-95ae10353056
2010-10-05 19:11:24 +00:00
Marc
9adaf521b7 - more accurate aft laser resell price.
- some code cleanup.
- OXP change: added new shipdata.plist key 'hyperspace_motor' if set to NO, no NPCs or player ships can enter witchspace on their own. Defaults to YES if not specified. Fuel injection and galaxy jumps are not affected by this change. New translation strings added and GUI screens updated to accommodate this change.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3739 127b21dd-08f5-0310-b4b7-95ae10353056
2010-08-21 13:43:09 +00:00
Marc
78f2a3ac05 Trunk only for now:
- fix: if looking at the commodity market while in hyperspace, just show 'Commodity Market' with null values as opposed to '(Nearest System) Commodity Market' - new translation string.
- fix: Stop fuel scoop activity indicators when standing still inside the corona and no scooping is actually taking place. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3717 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-26 11:50:58 +00:00
Jens Ayton
6d4a55504a [Mac] screen shots directory can now be moved around (on the same volume). If it is renamed, Oolite deliberately ignores it and creates a new one on the desktop. The dock tile plug-in has not yet been updated.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3672 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-15 13:15:12 +00:00
Marc
570a81ab35 Docking cleanup:
- fix: all autopilot options (and docking clearance) now follow the same, consistent rules: no docking help at main stations if fugitive, no docking help at other stations if hostile.
- fix: no more 'docking clearance revoked' messages after 'no docking clearance needed' if player / station becomes hostile.
- change: hostile stations don't send friendly 'come on in' messages anymore.
- change: shift-c and c can now be used interchangeably to exit autopilot mode.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3664 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-11 01:28:12 +00:00
Marc
27fbf520d1 - ported individual stations' station_roll setting to maintenance.
- fix: searching for one overlapping system by name in the long range map now should always identify the right system. (trunk & maintenance)
- docking clearance: all stations/carriers should now refuse docking clearance to hostile ships (trunk)
- more copyright cleanup

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3657 127b21dd-08f5-0310-b4b7-95ae10353056
2010-07-05 01:24:52 +00:00
Jens Ayton
c54fe64bbf Updated Mac OpenGL context handling to be slightly more similar to recommended best practice. Doesn't actually _follow_ best practice because best practice only works in Snow Leopard. Also, avoid unnecessary graphics reset during startup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3611 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-26 13:18:31 +00:00
Nikos Barkas
4414ba6f43 Fixed inconsistencies with the Extra Passenger Berth(s) description in the shipyard.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3492 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-10 17:47:35 +00:00
Marc
4ba056d516 - fix: one more overlay related bug, don't know how I missed it...
- better handling of - & feedback about - invalid data when selecting random 'missile' role missiles.
- Made the 'OXP messages' message less mysterious than before. One more translation string added.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3451 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-03 05:16:08 +00:00
Jens Ayton
d0fc6e191b Removed old nameless missile/mine armed messages (not used).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3411 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-26 19:42:12 +00:00
Nikos Barkas
b41ae4d829 Added missing 'OXP(s) containing messages found' message in descriptions.plist. The path of the OXP with messages echoed to the log is now the last path component only.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3291 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-05 17:11:41 +00:00
Nikos Barkas
cac50efa67 i18n'ed a spoken message.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3275 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-02 22:51:00 +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
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
Jens Ayton
64b4d4e9e3 Minor cleanup; made fallback material as weird-looking as it used to be.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2973 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-16 11:57:00 +00:00
Nikos Barkas
1cca29a600 Made joystick mapper screen strings localizable. Attempt to control long strings from messing up the stick mapper screen (test and fine tuning may be required).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2972 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-15 21:38:03 +00:00
Nikos Barkas
0e1226ca80 Roll year to 2010.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2969 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-14 16:58:32 +00:00
Jens Ayton
458fa19a7a Advanced cross-platform multiplication sign technology.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2949 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-09 20:16:02 +00:00
Marc
4022a5e9ee Oops! Corrected a warning to display only when appropriate to do so, and some minor tidying up...
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2943 127b21dd-08f5-0310-b4b7-95ae10353056
2010-01-09 12:36:38 +00:00
Marc
c010a69056 - Pause now works when docked. If paused when docked, no options are available. Added new translation string "game-paused-docked".
- Added 3 javascript properties to ships: isCargo, isDerelict and isRock (the last one identifies both asteroids and rock hermits)
- Tidying up!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2906 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-23 23:00:53 +00:00
Eric Walch
d7c3922fba - Corrected delay in: sendAllShipsAway.
- Corrected key for hostile messages in dockingClearance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2740 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-12 21:25:32 +00:00
Nikos Barkas
bde26b04df Fixed incorrect display of distance and time on Advanced Navigational Array when unreachable systems were targeted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2725 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-06 16:32:58 +00:00
Michael Werle
8abfd996a4 Named missile-armed messages, as per http://aegidian.org/bb/viewtopic.php?t=6895
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2670 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-12 21:22:01 +00:00
Jens Ayton
233dd3131e Cleaned up APIENTRY stuff, and implemented polygon sprite combine callback, thus enabling self-intersecting polygons.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2666 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-10 22:36:17 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-10 12:23:24 +00:00
Michael Werle
7bb913afe0 - Tweaked new docking-clearance-request-updates messages as discussed.
- Renamed docking-clearance resource strings to be more consistent.
- Fixed slow-gpus plist; it was causing exceptions in MacOS


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2647 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 20:26:02 +00:00
Marc
5ee5e3479e * New: ship.maxMissiles read only property. NB: NPCs always return the current number of missiles on board, due to current underlying engine limitations.
* Change: load failure prefix string altered to avoid the silly sounding 'Saved game failed to load. Could not load file.' That now reads 'Failed to restore saved game. Could not load file.': half as mysterious! :)

* Game Over fixes:
- after game over, Oolite now restores the last saved game. 
- there should be no more 'xyz broken equipment' messages after dying now.

I'm fairly sure I haven't broken anything there, but will port to maintenance after some more testing.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2616 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-28 15:06:18 +00:00
Marc
560e5501b1 * Autosave fixes ( trunk & maintenance ):
- no more autosave immediately after a restart.
- removed duplicate screen message during autosave.
- autosaved commander name is now 'CommanderName (autosave)' instead of 'autosave' as before.

* Trunk:
- changed the name of the autosave description key inside plist.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2609 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-27 03:10:39 +00:00
Marc
a0a1b592c2 Trunk:
* any found system in galaxy map is now restored properly from save games.
* various found system bugfixes.
* corrected new nova mission string typo.

Maintenance & Trunk:
* friendlier handling for missing ']' in expandDescription: will return the unexpanded string instead of nil, plus warning integrated better with logcontrol.plist

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2590 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-25 12:38:47 +00:00
Jens Ayton
30beac1d47 Updated prefs screen to reflect Groolite disabled status.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2531 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-19 20:23:08 +00:00
Marc
239d132e3b - yet another equipment screen tweak - corrected 2 other minor interface glitches
- fixed 'subentities disagreeing with parent' bug (when selling ships with subentities)

- windows change: -verify-oxp now gives proper feedback when finished.(thanks Eric)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2519 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-19 12:17:27 +00:00
Marc
71a6fb6822 - More gui related fun with the equipment purchase screen. It should now be clear that trying to purchase the same weapon for a particular weapon mounting as the one already there will not do anything. Various code tweaks needed to allow for that interface change.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2509 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-16 04:07:11 +00:00
Marc
09f4cc02e7 * equipment purchase screen part 4:
- Name of mounted weapons shown while purchasing new weapons.
  - 3 new translation strings added to the equipment purchase section.
* beaten some of the present GUI 'code' into submission to get the above to work.
* repositioned the background for novae system info screen.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2508 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-16 01:10:49 +00:00
Marc
3cb2045315 - many nova bugfixes, should now be more difficult to break the nova mission. Sun flares up at random intervals inside the nova system.
More testing required.
- systemInfo float values are now properly treated as numbers.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2491 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-13 01:25:18 +00:00