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

408 Commits

Author SHA1 Message Date
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
Jens Ayton
1feeb63fd8 Ran all game scripts through JSLint (http://www.jslint.com/), but not console script because it's full of JavaScript 2-isms. The JavaScript 2 that isn't going to happen. Yay. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2182 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-22 22:45:02 +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
7059e171e3 Fixed debug console crash on WinXP. Should work without problems on Linux and Vista too, please check. Increased Wormhole Scanner price to 2395Cr. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2143 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 16:05:49 +00:00
Nikos Barkas
a8c42528b2 Fixed a capitalization error in previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2137 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:59:56 +00:00
Nikos Barkas
e1cf86812a Commited Eric's updated nova mission script and added the nova_coward mission text. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2136 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:51:50 +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
b0c7b0dbfd Hopefully fixed a memory mismanagement situation that resulted in occasional crashes related to planet textures. Increased just a tad the default corona flare for enhanced prettiness. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2126 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-10 15:35:49 +00:00
Michael Werle
e0344e1d54 Wormholes: 
* Enable by default in GNUmakefile
* Adjust price to something more plausible
* Fix discrepancy in save-files between loading & saving

SDL Sound:
* Commit in sound patch when no sound-card available (was committed into 1.72 ages ago)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2124 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-08 22:36:37 +00:00
cmdrjames
fc710b9b1a Finally commit a change to heat handling after seeing a comment from micha about it (was discussed on forum a few weeks ago) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2121 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-05 15:05:11 +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
Nikos Barkas
71cc6e6e2b Switched hud.plist to OpenStep format and added example of drawing a yaw indicator bar (disabled by default - comment out relevant lines to enable). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2117 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-02 21:57:34 +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
Michael Werle
eb223d5784 * Revamped targetting system as discussed in http://www.aegidian.org/bb/viewtopic.php?t=5921 
* Added logging of compile-time options


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2106 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-28 00:42:48 +00:00
Marc
5b55c9bea1 Bugfix/update: customSounds tokens (e.g. [@boop]) can now be arrays too. Resolved some dangling inheritances inside logcontrol.plist & updated a couple of errors & warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2104 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-26 14:12:35 +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
5dac3c459e Reload speech stuff when changing game modes on all platforms; avoid exception due to mutating escort list while iterating it; made legalStatus_number alias of commanderLegalStatus_number (implementations were identical). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2098 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-20 15:27:56 +00:00
cmdrjames
8ac6b1dd3c better docking AI from Eric Walch 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2097 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-18 00:42:56 +00:00
cmdrjames
47213c7a5e fix for pirate cove defense-ships not working 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2096 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-18 00:39:57 +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
01eb2aaf3f Implemented the key cloak_indicator_on_status_light in hud.plist, default to NO. When set to YES, it will shift the colour of the status light towards blue whenever the player is cloaked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2084 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-05 02:05:17 +00:00
Jens Ayton
2c86763a5c Mucking about with shader effects. Fixed an inconsistency in oolite-font.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2082 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-01 13:40:33 +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
Nikos Barkas
0a161f1c4d Fixed a 'control reaching end of non-void function' warning. Updated the nova mission script to use the new sun.hasGoneNova method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2057 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 17:39:42 +00:00
Jens Ayton
8f841d5e62 Deprecated system.goingNova and system.goneNova in favour of existing Sun equivalents. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2055 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 19:36:20 +00:00
Jens Ayton
022f22173b Fixed normal-mapping bug in default shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2054 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 19:26:31 +00:00
Jens Ayton
58549d3c73 New subentity stuff now knows a dock when it sees it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2053 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 18:46:16 +00:00
Jens Ayton
557a353cc4 Subentity definitions can now be dictionaries, and this is now used as the internal format. Ship registry now uses mutable dictionaries for entries while working on them for simplicity, and uniques strings and numbers once done for efficiency (in the same way binary plist generation does for the cache... I really should double-check that GNUstep does that). Also simplified handling of external views, fixing a crashing bug (triggered the third time the player died) in the process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2051 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 17:37:20 +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
Jens Ayton
f16fde924e Whitelisted exitAIWithMessage: 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2047 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-09 22:45:54 +00:00
Jens Ayton
3c89480647 AI tweaks: added exitAIWithMessage: and messageSelf:, made exitAI alias of exitAIWithMessage: RESTARTED, added optional message parameter to JS Ship.exitAI(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2044 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-08 20:39:48 +00:00
Jens Ayton
ca68c038a4 JavaScript tweaks: deprecated entity IDs; made Entity.position and Entity.orienation read/write since their read-onliness wasn't really accomplishing anything; added toSource() method to Vector and Quaternion; Vector() and Quaternion() constructors can now be called without the new keyword, allowing the use of call() and apply(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2038 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-07 12:53:09 +00:00
Jens Ayton
dbde672d01 "Small" change to group and escort handling, now with explicit group objects. I really must stop making "small" changes. (N.b.: JavaScript ShipGroup currently fails to work in interesting ways.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2028 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 16:13:36 +00:00
Jens Ayton
614341a04d Implemented dropMessages: and debugDumpPendingMessages AI commands. Added experimental dealyedReactToAttackAI, and used it in planetPatrolAI.plist (which was previously ignoring missiles). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2022 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-31 14:16:53 +00:00
Jens Ayton
204bb2248d Made logging-echo-to-stderr preference work on all platforms; updated header comment in logcontrol.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2021 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-31 12:51:48 +00:00
Jens Ayton
8275ac7cc0 Removed now-pointless logging-show-app-name option. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2015 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-27 21:43:34 +00:00
Jens Ayton
475398f489 Full sript whitelisting support. Some script actions and conditions could do with pre-sanitizing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2013 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-25 20:15:42 +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
164fd3f2e9 Implemented whitelisting for legacy script conditions, and accidentally optimized evaluation while at it. Conditions for world scripts are currently sanitized (i.e. whitelisted, aliases resolved, syntax checked and partially tokenized) on the fly; this will be cached once sanitizing is implemented for actions. Deleted unused class OOLegacyEventHandlerScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1998 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-16 01:24:01 +00:00
Jens Ayton
7e258819b9 Implemented shader uniform binding whitelisting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1997 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-13 08:51:46 +00:00
Jens Ayton
3997e2c835 Merged -[ShipEntity nearestPlanet] and -[ShipEntity nearestLargeBody]. Cleanup. Added uniform bindings to whitelist.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1996 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 19:47:11 +00:00
Jens Ayton
7c2ab9b595 It's a good idea to save everything before checking in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1995 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:32:43 +00:00
Jens Ayton
46c7fef016 Whitelist fixes based on forum suggestions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1994 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:19:27 +00:00
Jens Ayton
b02f108735 Implemented AI validation OXP verifier stage. Removed invalid and unused shuttleAI.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1993 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:04:02 +00:00