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

1842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nikos Barkas
2a4ff27ad1 New feature: Time Acceleration Factor. Activated while in pause mode with left and right arrow keys. Can be from 1/16 to 16 times the normal time. Also controllable by JavaScript using the read/write timeAccelerationFactor global property for bullet-time-like effects. TAF is visible in the FPS display. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2181 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-20 12:41:15 +00:00
Nikos Barkas
688d186508 Made incoming missile targeting a default build option. A clean project rebuild is recommended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2180 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-19 07:59:20 +00:00
Nikos Barkas
341ddcfd98 When the player enters a wormhole, Oolite now remembers the player's originally selected destination, as it could be different to the wormhole's one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2179 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-17 10:28:39 +00:00
Nikos Barkas
4e9cb8dbc6 Fix for Berlios bug #15688 (Mother attacking its own escort): Clean mothers can now only accept clean escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2178 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-14 22:35:52 +00:00
Nikos Barkas
686bdef0a2 Fixed a bug where the mission screen background would remain after a scripted launch of the player ship before the normal end of mission screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2177 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-12 16:21:42 +00:00
cmdrjames
7e7430883e minor fix for xcode warning 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2176 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-10 15:31:53 +00:00
Nikos Barkas
9fdf492a87 Better fix for escort ship circular references, as proposed by Eric. The fix is that escorts cannot have escorts of their own anymore. This avoids memory overflows in cases of recursive escort-ship, escort-role and mutual escort ship references between two or more ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2175 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-10 13:38:31 +00:00
Nikos Barkas
7b46becefc Fixed memory overflow that was happening when a ship dictionary contained an escort-ship key of the same name as the dictionary key of the mother ship (e.g. boa-mk2 attempting to generate 4 boa-mk2 escorts). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2174 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-09 14:48:30 +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
f2efe5fbec Add some extra info to debian/control; add debian/copyright. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2171 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 22:44:17 +00:00
Darren Salt
07ef0e42d6 Fix handling of oolite.dbg when building .debs with DEB_BUILD_OPTIONS=noopt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2170 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-07 22:08:21 +00:00
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