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

1960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
0b5fb4c611 Didn't see another_commanders' r2114 commit until this was ready; in either case: 
More tweaks to Wormhole Scanner code to prevent missiles locking onto wormholes. Also prefer cyan to blue for the target reticle.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2116 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-01 22:35:02 +00:00
Marc
d933d088ad Splash image & icon load without resource manager once more, to allow for shift to flush the cache properly. 
Added the playerWillEnterWitchspace event, triggered by the "PLAYER WITCHSPACE" AI message.
Stations shouldn't launch more than max_police anymore, and they shouldn't award any kill credits either.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2115 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-01 20:55:51 +00:00
Nikos Barkas
1e463a167f Wormholes are now not targettable without the Wormhole Scanner. When targetted, their corresponding reticle color is now blue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2114 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-01 14:40:52 +00:00
Marc
fe82dc9a04 weapon_energy for missiles is working again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2113 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 15:29:07 +00:00
Marc
15ef0faf17 Berlios 'bug' #015002: implemented weapon_energy for NPCs forward lasers (clamped at 50 - the mining laser energy) updated the wiki entry to reflect actual implementation 
More consistent handling of fullscreen sizes: resolutions outside the min & max display size values are now ignored in windows & linux too. Minimum display size is now 640x480 across all platforms.
Improved corona redraw speed. Removed a mac compile warning, small code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2112 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-03-31 12:26:28 +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
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