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

115 Commits

Author SHA1 Message Date
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
Marc
9a7c0885ff - Oolite now saves strict / unrestricted mode settings, and starts up accordingly. 
- minor code tidying up, including Universe init /reinit functions.
- selling prices are now more accurate.
- removed unused startup strings, and a mac compile warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2418 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-07 00:31:42 +00:00
Jens Ayton
00fc0dccbe Fixed proceeed typo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2368 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 19:16:12 +00:00
Marc
187dc2687f * repositioned message row, and reworked status screen. Messages now fully readable in standard Oolite. 
* if a message is repeated after 6 seconds, it will now show again, otherwise it's ignored as before.
* game settings screen: mac fullscreen resolution changes are now immediate, and F12 changes in SDL give immediate feedback.
* some minor code optimisations & cosmetic changes, including a mac splashscreen string.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2275 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-04 01:46:53 +00:00
Nikos Barkas
b7868e42a7 Nova mission related improvements. Fixed crash viewing F7 screen and a different aegis related crash when in a system gone nova. Aegis crash bypassed by disabling compass in nova systems for now. Made government, inhabitants and economy strings for nova systems user modifiable. Finally, added bounties for pirates generated with auto_ai set to YES. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2195 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-06-04 18:01:05 +00:00
Darren Salt
1f2c2111f5 Plural handling for languages with more than one plural form. 
For documentation, see Resources/Config/descriptions.plist.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2173 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-08 17:43:11 +00:00
Darren Salt
add5b672d4 Combine two message pairs into single messages. This tidies up speech a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2155 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-01 15:11:46 +00:00
Darren Salt
8443bf9cb6 Voice type selection for use with espeak. 
The "espeak-default-voice" description key sets the default type.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2153 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-30 20:55:09 +00:00
Nikos Barkas
fc462e2e9f Commited a preliminary version of Eric's update to the Nova mission. The witchspace buoy now sends distress call messages when in the vicinity of the player, if current system is going nova. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2134 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-20 22:35:54 +00:00
Nikos Barkas
196e813089 More improvements in for the Wormhole Scanner. Details like destination, ETA to destination and time before wormhole collapsing appear on the targetting reticle area as well. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2119 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-04 00:20:49 +00:00
Michael Werle
d7578e4f36 Wormholes: 
* Added code to add wormhole to scanned wormholes (was omitted in r2111) without which persistent wormholes doesn't work. Oops.
* Added delayed decoding of information from scanner - data added to the communications log
* Upped tech level to 9

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2118 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-03 22:41:03 +00:00
Michael Werle
360e502c40 First draft of the Wormhole Scanner 
To test: define WORMHOLE_SCANNER preprocessor macro (see GNUmakefile), by default off.

TODO: 
 * Restore wormhole if not expired and in current system
 * Draw Wormhole exit effects
 * Revise techlevel, price, description
 * bugs?



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2111 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 01:12:24 +00:00
Marc
6a2fca0aeb Planet refactoring II: textured planets now show up in system data screen. System data screen better optimised. Prices inside the gui are now either padded(goods market), or right aligned (equipment, shipyard, passenger/carrier market) - minor adjustment to carrier market premium. All in-flight screens now switch to forward view when starting hyperspace jumps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2102 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-25 03:57:38 +00:00
Jens Ayton
886bfccbab Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-15 16:14:03 +00:00
Nikos Barkas
d12f5ceb06 Oh, it's 2009 already ;-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2067 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-16 11:19:24 +00:00
Marc
0ebb54a9e4 Advanced compass key binding: Oolite/win detects non-US keyboards now, and assumes they're UK ones. Option screen from paused: switching to strict/unrestricted mode now works ok. Experimentally activated 'begin new game' from paused - doesn't seem to cause trouble so far. Mouse control bugfixes: when mouse control is meant to just work in fullscreen, switching to windowed now disables it. SDL: Mouse cursor now shows as intended! 
Game over screen now displays ranking as well as credit, minor strings cleanup. (yes, there's another one to translate...)
Ported mouse & 'paused strict mode' fixes to 1.72-maintenance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2066 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-15 21:05:19 +00:00
Nikos Barkas
be5b4ff96c Hostile autopilot targets will now refuse to issue docking instructions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2062 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-13 15:28:27 +00:00
Marc
644557d6b1 some refactoring of intro/demo screens, removing some duplicate code. fixed a wrong DESC string, and possibly completed the great DESC string migration. cleaned up a small part of the SDL gameView code. Splash screen can now be enabled by #defining SDL_SPLASH 1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2061 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-13 11:22:27 +00:00
Marc
e6cc1b416e Odds and ends: 'frozen target' bugfix bugfix by Cmdr James, code cleanup for fullscreen switch in windows/linux by mwerle, & brightened demo ships display. Added splash screen and application icon to windows & linux versions and discovered a few more strings to translate (they're on the splash screen at startup - mac only for now) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2049 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 03:47:23 +00:00
Nikos Barkas
819c878a0c Made procedurally textured planets a game option. Requires definition of the ALLOW_PROCEDURAL_PLANETS macro. Procedurally textured planets as a debug flag remains by defining the ALLOW_PROCEDURAL_PLANETS_AS_DEBUG_FLAG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2006 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-21 18:22:43 +00:00
Jens Ayton
a26e612250 Minor tweaks to Mac startup screen; added code for preloading/caching of all meshes, disabled until I finish some refactoring of OOMesh. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1899 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-10 19:23:01 +00:00
Jens Ayton
bc07f0e740 Changed %X string code to %N. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1893 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-05 12:33:56 +00:00
Nikos Barkas
d30e46fb02 Fix a little issue where docking clearance cancellation messages would appear on screen even if no clearance had been given, every second time player pressed 'L'. Reverted AI code fix from previous commit, as it was resulting in idle ships being launched from stations. Set default rock hermit docking clearance requirement to no. Adjusted a little the docking clearance messages to make sense also in the case the issuing station is not a main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1792 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-11 08:30:12 +00:00
Michael Werle
addc42eb68 Changes to Docking Clearance functionality (Feature Request #4327): 
* Now works at all stations, not just main stations
* Player ships get placed into a 'docking queue' when requesting clearance
  * Station notifies player when queue-slot expires and gives chance to extend
  * Player can cancel docking-request
* Stations not requiring docking clearance now respond with an appropriate message



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1790 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-10-08 06:58:32 +00:00
Nikos Barkas
711b189d38 Further improvements to docking clearance. Penalty of 5 percent of credits amount with a ceiling of 5000 Cr applied for anauthorized docking. Station responses to docking clearance selected from lists. No penalty applied when sun is going nova. Only fugitive players are denied clearance to dock. All the above still needs -DDOCKING_CLEARANCE_ENABLED to be compiled in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1768 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-23 09:51:14 +00:00
Nikos Barkas
9ed1b38567 Very basic initial implementation of docking clearance request. DOCKING_CLEARANCE_ENABLED must be defined in order to compile this in. Moved related hardcoded strings out to descriptions.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1765 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-21 13:01:19 +00:00
Jens Ayton
fb3b2b7ebe Shipyard code now uses OOShipRegistry. Simplified some code by using OOEquipmentItem instead of fiddling with arrays; should do more of that. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1691 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-11 20:25:09 +00:00
Jens Ayton
a11ce38786 Made JS player.orientation work properly. Fixed some extra-niggly warnings. Made various JS system properties return placeholder values in interstellar space. Added -[Universe inInterstellarSpace] method, and made -[Universe currentSystemData] return placeholder values in interstellar space. Two new localizable strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1661 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 19:12:31 +00:00
Nikos Barkas
08ebc6dd29 One more string farmed out. Apparently they will never end. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1659 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 12:09:37 +00:00
Nikos Barkas
d97720b1a7 Even more hardcoded strings found and externalized. Are they ever going to end? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1658 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-29 10:55:00 +00:00
Nikos Barkas
132a643af6 Two more hardcoded strings out to descriptions.plist 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1636 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-05-14 14:14:13 +00:00
Jens Ayton
ff322eafcb Fix for bounty and contract market credits display bugs. Fix for rounding of credits quantities. Added troubleshooting code to scanForNonThargoid. Suppress script.javaScript.context.create messages. Made property list extractors for strings auto-convert numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1601 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-30 19:13:02 +00:00
Jens Ayton
fba5cb83b1 Removed redundant [UNIVERSE gui] calls in PlayerEntityControls. Added Spotlight indexing of system name and made ship name visible in Get Info window (OS X only). Added new formatting functions for credit quantities, used throughout. DESC() now returns the key if no string can be found, to avoid exceptions. I18Ned OXP incompatibility message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1581 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-23 16:56:23 +00:00
Jens Ayton
07d8d4ae50 I18ned Groolite mode strings. Use typographic multiplication sign for screen resolution strings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1578 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 16:13:03 +00:00