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

1730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Darren Salt
b65a385115 Remove obj{,.spk}{,.dbg} in the "clean" target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2169 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 22:07:07 +00:00
Darren Salt
05120ef44c Have functions for determining sort order return NSComparisonResult, not int. 
Remove the corresponding Debian-specific patch, which only partially addressed

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2168 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 21:22:17 +00:00
Darren Salt
43cf6cfb58 Set Terminal=false in the .desktop file. 
Remove the corresponding Debian-specific patch.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2167 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 21:09:59 +00:00
Darren Salt
972e2afbd2 Automatic (compile-time) centring of load/save & game options menus. 
(This relies on the main text GUI object having the default height.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2166 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-06 17:01:47 +00:00
Jens Ayton
c279d9ea8c Fixed build under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2165 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-04 20:00:07 +00:00
Darren Salt
27d2864887 Use an array length macro instead of sizeof(array)/sizeof(array[0]). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2164 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-04 15:12:07 +00:00
Darren Salt
06e1b0f131 CRLF → LF fixup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2163 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 20:55:41 +00:00
Darren Salt
d8e11361cb Don't display ship data when no ship is selected. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2162 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 20:49:19 +00:00
Nikos Barkas
71a4ffd91f Eliminate an unused variable warning. Avoid magic number in -tryBuyingCommodity: 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2161 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 20:41:06 +00:00
Darren Salt
ee12dab7bc Do some tidying up of the equipment and ship purchase listings. 
In particular:
* avoid "Back <--" where we're showing the second item;
* avoid "More -->" with 12 ships; and
* fix "Back <--" behaviour (was jumping back four ships too far).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2160 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 20:16:24 +00:00
Darren Salt
b203975f05 Store the custom view number in saved games. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2159 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 15:56:37 +00:00
Darren Salt
310ac8eef3 Remove "reduced detail" from saved game files. 
It is not appropriate there since it should reflect what the hw is capable of
(consider a saved-game file accessed over a network).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2158 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-03 15:22:43 +00:00
Darren Salt
7f6d50800e Sell/buy as much as possible via Shift+left/right. 
Prefer to buy with Shift+Return.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2157 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-02 02:00:50 +00:00
Nikos Barkas
de5eb05a59 Added the script event handler playerTargettedMissile, as per Eric's suggestion. Handler takes as parameter the entity targetted by the player (can be also nil). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2156 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-01 21:30:09 +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
a58978e0ae Correct "#if HAVE_LIBESPEAK" (should be #ifdef). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2154 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-01 15:07:54 +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
Darren Salt
79c72b7c76 Terminate the string to be spoken (via espeak) with two NULs. 
(The last parts of some strings are mis-spoken; seems to be length-dependent.)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2152 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-30 13:58:10 +00:00
Nikos Barkas
8d77a7b467 Made missiles always return true in ShipEntity's hasHostileTarget: Implemented targetting of nearest incoming missile. This is activated using Shift+t or an assigned joystick button. Testing is still required. The entire implementation is guarded with the TARGET_INCOMING_MISSILES macro, disabled by default until it is agreed that this change does not influence gameplay in undesireable ways. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2151 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-29 20:29:15 +00:00
Darren Salt
7c0d723be0 Stop the sensitivity toggle from affecting the deadzone size; fix comparisons. 
The division & sensitivity toggling should, I think, really be happening in
the joystick code in PlayerEntityControls.m. However, this gets things
working better for now.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2150 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-29 20:14:09 +00:00
Darren Salt
ccd2f024b5 Display hat switches properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2149 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-28 16:02:54 +00:00
Darren Salt
73718b3733 Bring the MacOS-specific code into line with the SDL code wrt joystick #defines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2148 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-28 15:53:45 +00:00
Darren Salt
f2293e5072 Remove an obsolete patch file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2147 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-28 13:57:29 +00:00
Darren Salt
df8db7e3a2 Fix a build warning, introduced with joystick hat handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2146 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-28 13:49:35 +00:00
Nikos Barkas
4bdb6adf94 Minor correction to previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2145 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-26 14:35:12 +00:00
Nikos Barkas
38e15fcf9b Added the JavaScript function fireECM() to the OOJSShip class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2144 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-26 14:15:44 +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
getafix
2ad96962e3 Fixed bug #14292. Precision mode toggle was causing yaw. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2142 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 14:27:29 +00:00
Michael Werle
5bdf1f3f84 Debug Console - add timeout when opening connection. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2141 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 09:49:05 +00:00
Nikos Barkas
bc405b7d9f Committing Darren's patch for joystick hat support on SDL builds, thus resolving Berlios bug #15561. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2140 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 09:14:28 +00:00
Michael Werle
a5dde875cf Added delay after opening streams to fix Bug #15565 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2139 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-25 08:32:25 +00:00
cmdrjames
c0ab3e3a45 Add wormhole scanner to xcode build. Shouldn't impact anyone except mac users building from source. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2138 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-23 22:11:55 +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
d20853c290 Better fix for crash happening when a non existing jsvalue was passed to JSValToNSString. Fixes also a problem with the nova mission, where mission.setInstructions would not accept null as a parameter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2135 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-20 23:56:38 +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
Michael Werle
486549304a Added texture_hsb_color as proposed in http://www.aegidian.org/bb/viewtopic.php?p=75075 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2133 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-20 21:01:24 +00:00
Michael Werle
496bbb8af7 * Planet texture colour override bugfix 
* GNUStep NSInteger bug workaround
* Log crash when SDL View can't be initialised
* Compile-time warning fix with OOGUITabStop


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2132 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-19 18:36:56 +00:00
Marc
371fa45b97 Wreckage rescale bugfix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2131 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-18 16:13:57 +00:00
Marc
df8e39c8f0 Planets: 
- planet now redrawn when detailed planets settings change.
- tweaks to F7 to show more planet details.

Scripting: bugfix for rare js crash to desktop.
Subentities: committed Screet's subentities fix.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2130 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-18 01:02:56 +00:00
Nikos Barkas
0a95bd6a23 Removed surplus punctuation from -initSunWithColor: (how did this compile without even a warning?) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2129 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-15 19:52:44 +00:00
cmdrjames
f232ea4b32 Fix for enumerator mutation warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2128 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-14 10:23:38 +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
Nikos Barkas
f1014cae40 Fixed a bug where escorts belonging to traders would be assigned to the stations launching them. Commented out the code that caused the cloaking device to charge up the energy banks upon switching it off (thanks Screet). Unless there is a justification for this behaviour, I believe this code can be removed. Updated the Reference Sheet to the latest, corrected version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2123 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-07 12:28:37 +00:00
Michael Werle
696f83ba0c Wormhole Scanner: 
* Rearranged computation order and adjusted time of items as discussed with Nikos
* Switched position of ETA and Collapse-time on HUD to reflect new compute-order



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2122 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-05 22:40:44 +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
Michael Werle
6fe19d7234 Wormholes - fixed macro name-error, preventing wormholes from being saved. Thanks Nikos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2120 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-05 07:43:30 +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