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

1674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4620351452 Adjusted corona redraw and restored previous suns positions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2110 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-30 02:12:28 +00:00
Marc
d9f42fdc4a Bugfix:bug #015072 all system properties now update immediately. 
Enabled setTexture() at all times, to allow for in-system dynamic retexturing.

Added new system settings to planetinfo.plist:"sun_radius" (float), "sun_color" = (any Color string), "corona_shimmer"= (float: 0-1), "corona_hues"= (float: 0-1), "corona_flare"= (float: 0-1)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2109 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-29 15:37:53 +00:00
Nikos Barkas
c769fd1b63 Fixed bug where cloak would not be unset on game restart after player ship had been destroyed with cloak active. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2108 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-29 13:45:57 +00:00
Marc
1ce566ff0a Custom views array handled properly again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2107 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-28 01:54:02 +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
ab738367fe Default custom_views stub & better handling of weapons offsets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2105 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-27 22:41:05 +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
95d12ab71f Change: customsounds will now accept arrays, in a similar way to descriptions: see http://aegidian.org/bb/viewtopic.php?p=73673#73673 on the wiki. Added _ds_'s patch: WMIcon.bmp & splash.bmp will be now found via ResourceManager, and can be overridden by OXPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2103 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-26 02:52:15 +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
Nikos Barkas
5d4b8291ee Updated KZ9999's Reference Sheet to latest version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2101 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-24 20:12:04 +00:00
Nikos Barkas
6f5fb66763 Commited to trunk Darren's patch for enabling icons/symbols on compass. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2100 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-22 18:43:42 +00:00
Marc
1ca32740d8 Interface change: While in flight, pressing h from the local galaxy map will initiate hyperspace jumps - before, the player had to exit the map to do so. Partial refactoring of planet generation code: main planet positions are now consistent across platforms. Warning issued when 'abs' coordinates are used inside plists for spawning in normal space. Begun normalising errors & warnings, created OOLogERR & OOLogWARN as specialised OOLog cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2099 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-21 18:42:16 +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
Nikos Barkas
bac97c78e0 Updated KZ9999's reference sheet with a newer, better version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2095 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-16 13:30:11 +00:00
Marc
6ebaadfa5c Oops: removed redundant setAIState. Added error report to AIState='something'; 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2094 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-16 10:36:33 +00:00
Marc
4d7cd26159 Pause + F2: messages are now cleared from the display, allowing users to see the options available. Added ship.setAIState() to javascript functions, + minor code & contributors tidying up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2093 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-16 01:24:17 +00:00
cmdrjames
57dd66cae9 Prevent ships from escorting things with different scan classes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2092 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-15 23:14:37 +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
getafix
66f5f8c095 Stopped miniature planets from interfering with stellar body distances calculations. Fixes bug where altitude was lost when switching to F7 screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2090 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-14 14:51:39 +00:00
Nikos Barkas
5ed1a6a11b Replaced old Reference Sheet with new one by KZ9999. Added KZ9999 to the contributors list. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2089 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-09 20:55:44 +00:00
Michael Werle
c564bda496 * Fix sequence drift in Ranrot when using -DALLOW_PROCEDURAL_PLANETS by saving and restoring the ranrot seed in PlanetEntity.m. Symptoms included change of Coriolis position. See http://aegidian.org/bb/viewtopic.php?t=5842&postdays=0&postorder=asc&start=45 for details. 
* Added two missing #ifndef NDEBUG bracket in OOJSConsole.m.
* Changes also committed to 1.72 branch.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2088 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-09 14:49:51 +00:00
Marc
a5f2d8b916 2085 part 2: ported '4 pixels width increment' bugfix to linux, and to 1.72-maintenance 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2086 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-07 21:34:45 +00:00
Marc
2453d9a772 Windows bugfix: window width now changes in 4 pixels increments to avoid 'sheared snapshots'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2085 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-07 18:29:21 +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
22bca1e207 Added -w (wrap) option to distance mapper. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2083 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-04 23:03:43 +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
Jens Ayton
c9cdfcf71f Planets are now tracked explicitly instead of being searched for several times a frame. Squashed a few static analysis diagnostics. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2080 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-28 14:15:26 +00:00
Marc
7590831209 Bugfix: Bug #13273: weapon_position_ has no effect - now weapon_position will be honoured, with position in metres from the centre of the ship. recalculated the firing position for turrets/subentities, now consistent with the ships'. 
Change to custom_views: to assist in weapon positioning, custom_view's weapon_facing key now defaults to 'last fired'. weapon_facing=forward now needs to be declared explicitly.
Improved filtering for incompatible shipyard equipment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2079 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-28 06:28:03 +00:00
Marc
2232dddb05 Fixed: now Oolite takes into account incompatible equipment when generating ships for sale 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2078 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-25 22:19:28 +00:00
Nikos Barkas
ec6e284401 Fixed negative cargo bug shown in shipyard for ships with cargo capacity less than 5t that had EQ_PASSENGER_BERTH as optional equipment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2077 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-25 10:25:37 +00:00
Marc
3f301f5abf Corrected progressive shrinkage of framed window under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2076 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-23 20:25:07 +00:00
Nikos Barkas
a562b212bb Fixed website shortcut url and removed obsolete batch file from the Windows installer script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2075 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-23 19:16:28 +00:00
Nikos Barkas
4d0fd3267c The Windows executable now sets itself up when starting, making the RunOolite.bat file obsolete. Also, no more console window appears on Windows when starting the game. Modified installer script as required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2074 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-23 18:54:14 +00:00
Marc
2a6c00b278 All SDL & windows fixes: reworked windows port to resize game view without texture loss. Splash screen for both linux & windows. When switching fullscreen resolutions using F11 oolite now saves the new fullscreen resolution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2073 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-22 23:15:41 +00:00
Nikos Barkas
3d5238bd39 Fine tuning the passenger carrier market prices. Higher prices are now paid for reputation greater than 5 instead of 4. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2072 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-22 14:26:09 +00:00
Nikos Barkas
4c8ceacacb Make passenger carrier market a bit more interesting by rewarding long taxi runs. Credits paid increase exponentially with number of hops required. Reputation of player is also taken into account. May require some fine tuning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2070 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-20 14:02:07 +00:00
Nikos Barkas
d7fe7b0bfd Fixed cannot-rebuild-cache-twice-in-a-row bug under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2069 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-19 09:02:31 +00:00
Marc
5efe66287d win/linux F11: if there's just one resolution, don't switch! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2068 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-16 12:32:19 +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
Jens Ayton
fc2a59f0d2 Detect and remove jsautocfg.h in SpiderMonkey/js/src when building with Xcode. (This can happen if you run the configure script and breaks the build for PowerPC, or x86 if you ran the configure script on a PowerPC Mac.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2065 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-15 15:15:49 +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
Jens Ayton
0ae995f27c Contributors.txt issues: we no longer use F-Script, and SpiderMonkey is not OS X-specific. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2060 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-13 11:10:32 +00:00
Jens Ayton
b02018341b Always use native exception syntax via macros instead of setjmp/longjmp under Mac OS X. This removes the need to insert volatile in random places to avoid build warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2059 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 21:06:00 +00:00
Marc
a4c87db67c fixed copy & paste error (!) inside SDL/MyOpenGLView.m 
removed redundant demo screen code from inside gameView
intro music now plays again when 'begin new game' is selected.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2058 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 18:07:25 +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