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

97 Commits

Author SHA1 Message Date
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
Jens Ayton
b07b78a42d Fix for formatting mismatches between unsigned long long credit quantities and %d format specifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1575 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 21:58:06 +00:00
Jens Ayton
a3cd6cf6ca Stuff from r1565-r1566, now with not doing the svn in src/. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1567 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-20 15:02:38 +00:00
Marc
6ef2d66b16 JS Bugfix: changes to local system properties (tech level, government, etc...) now take effect immediately. Minor change to a new description string. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1545 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-06 00:18:03 +00:00
Marc
cc9f7cd857 Energy unit changes: energy units recharge rate adjusted to offer a better challenge to the player, and naval/extra energy unit purchase behaviour more flexible (see resolution of Bug #13507, Naval Energy Unit bug in berlios). Warnings added if energy units are going to be removed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1544 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-05 16:12:59 +00:00
Jens Ayton
69003c93ed Added Thargoid Curses to SystemDescription.dot output, and changed the Eat Foo, Bar! insult to use more varied values of Foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1521 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 09:31:35 +00:00
Marc
3990d547dc Minor plists cleanup, added player.equipmentStatus & player.setEquipmentStatus, to allow damaging and repairing equipment via javascript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1511 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 03:38:50 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Jens Ayton
9cfe8c910a Removed all magic equipment flags. Moved equipment list into ShipEntity. Ship loading and saving now mostly uses OOCollectionExtractors, and is generally simpler and more robust. Be on the lookout for interesting new equipment-handling bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1490 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 23:16:07 +00:00
Jens Ayton
f67b87aa0d Ahruman's dazzling distraction attack strikes again. All beep, boop and click sounds now go through customsounds.plist. Setting the player's target through JS now works more or less as expected (locks on ident, with UI feedback, unless a missile is selected in which case current missile is locked on to the new target). Custom sound tags can now expand to other custom sound tags (with recursion checking), and final results are cached. No actual progress on the nova script I thought I was working on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1477 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 19:49:46 +00:00
Jens Ayton
627e5a9b57 shipWillLaunchFromStation() is once e again called for the player. Ejected items and debris are now spawned with 85% of the parent's cabin temperature. Incompatible OXP message is now loaded from descriptions.plist, but only the internal descriptions.plist; listing incompatible OXPs and generating the messages later would be a better approach. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1476 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 08:25:42 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +00:00
Marc
91358f71a2 More station defence stuff. Special cargo expanded and amended: it can now be saved, and no containers can be loaded on board while the special cargo is in the hold - scooping cargo will not work, and purchasing & awardCargo are only allowed for small valuables. Added a few more strings for translations. Minor code tidy up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1467 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-09 04:10:42 +00:00
Jens Ayton
4c3cf42f7e Fixed a small leak in the previous revision. Unified the various missile/ident locked-on strings. Made :: console macro work for methods with an argument string, as in :: playSound: boop.ogg. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1457 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 11:26:12 +00:00
Nikos Barkas
74ae10a5c9 Resolution for bug #12659 (scripted cargo pods do not award cargo when scooped). Added the CLASS_CARGO scan class to alloy and splinter in shipdata.plist, so that they don't appear unscoopable and with legal status when spawned by scripts. Finally, yes, you guessed it, more strings externalized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1448 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-03 06:46:40 +00:00
Marc
8db171cf6a bugfix for cloaking device mission, new string added: 'autosave-commander-name' 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1447 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 20:41:07 +00:00
Marc
889bdbbbdb Bugfix for very long passenger names in the Carrier Market. Change to Console.consoleMessage: ConsoleMessage('message') is now shorthand for ConsoleMessage('command-result','message'). Added Autosave option, with associated translations strings. bugfixes ported to 1.70-maintenance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1442 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-02 05:31:43 +00:00
Nikos Barkas
1d5898fc0a Made the planet derivative suffix (like -ian for Laveian) user definable, might be useful for translation purposes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1428 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 08:57:24 +00:00
Nikos Barkas
4184df3da4 Two more hardcoded strings found and migrated to descriptions.plist (I wonder when they are going to end, they continuously seem to come up). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1427 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-27 07:03:25 +00:00