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

1648 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc
7c16256154 Rolled back the splash screen code due to conflicts with texture buffering in windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2056 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 10:01:09 +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
2ff91cb503 Fixed slight all-flashers-are-red bug in r2051. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2052 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 17:52:38 +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
f8b348be25 2049 part 2: initialisation bugfix. Stopped splash screen on linux for now and toned down extra brightness on demo ship screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2050 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-11 13:09:24 +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
be69115e46 Fixed yet more build warnings due to FSF-gcc being dumber than Apple-gcc about ObjC type matching. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2048 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-10 21:53:26 +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
getafix
bdf9c7b02e Joystick menu highlight was set to first function after configuring a function. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2046 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-09 12:53:01 +00:00
getafix
43665c8d13 Joystick configuration menu navigation fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2045 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-09 10:13:15 +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
63a6ba94a3 Enforced use of accessors to get at Entity status property in order to help track down status-is-DOCKED-but-dockedStation-is-nil messages when scripts test whether player is docked; as a side effect, the bug seems to have gone away. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2043 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-08 15:46:23 +00:00
Jens Ayton
8d9611ea8b Fix four sound hiccoughs when stopping and starting fuel injectors quickly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2041 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-07 16:42:13 +00:00
getafix
613165a8ee Fixed wrong default option in Joystick Configuration menu for SDL builds. The default option is always set to the first option of the first option-page. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2040 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-07 14:05:06 +00:00
Jens Ayton
faf58aa744 Attempt to fix occasional bug where ship remains targeted despite being out of range. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2039 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-07 13:48:22 +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
Nikos Barkas
2bb7420bbb Fixed some compiler complaints on OOShipGroup.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2036 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 22:07:57 +00:00
Jens Ayton
358543e7ed Rearranged GNUmakefile for easier diffing and browsing. (Roughly matches layout of Xcode project, which is useful as long as it's mostly being edited by me.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2035 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 21:48:50 +00:00
Jens Ayton
b268bed080 Fixed further build breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2034 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 20:39:20 +00:00
Jens Ayton
701b315d3e Fixed build breakages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2033 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 20:36:21 +00:00
Jens Ayton
18abac1954 Fixed stupid bug preventing JS ShipGroup from working. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2030 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 16:51:39 +00:00
Jens Ayton
12e982fa06 Removed a bunch of temporarily #ifed-out stuff from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2029 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-06 16:42:22 +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
1ccfa1ea58 Fix crashing bugs in error reports in JS Timer constructor. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2025 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-03 17:04:50 +00:00