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

1001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
a97c9fd093 Fixed a few leaks, notably one that became serious on the short-range chart screen. Fixed some warnings when building for Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1282 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-24 13:59:30 +00:00
Nikos Barkas
837407e4ac Fixed a small bug that was there since 1.65, whereby switching to equip ship screen would sometimes display information for equipment other than the normally selected missile, because selectedRow was not set correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1279 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-23 12:44:10 +00:00
Jens Ayton
de3b08129a Extremely minor tweaks; just synching two different working copies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1278 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-23 10:59:56 +00:00
Nikos Barkas
b59aa4338e Do not allow fuel injectors on NPC ships if we are on strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1276 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-21 06:40:36 +00:00
Nikos Barkas
cb8b00e71b Fixed crash on attempting to select game to load. Note: The printf %llu modifier for unsigned long long may have to be used wherever credit quantities must be displayed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1275 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-14 08:00:19 +00:00
Jens Ayton
4919cb197e Changed OOCreditsQuantity to uint64_t. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1274 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-13 11:53:25 +00:00
Nikos Barkas
1dd0b50f52 Fix for trade-ins (like selling missiles or replacing lasers) not working. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1272 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-13 10:54:44 +00:00
Jens Ayton
3e845c4299 Fix for scanForRocks AI method only finding boulders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1271 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-10 13:57:52 +00:00
Nikos Barkas
d2c81836ad Fixed laser purchasing mishandling bug in equip ship screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1269 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-10 11:16:21 +00:00
Jens Ayton
d243222ab0 Enhanced r1266/1267 change to scriptActionOnTarget: to restore script target when done, to reduce risk of side-effects. Also fixed checkForShips: to only search by primary role. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1268 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-08 12:06:52 +00:00
Nikos Barkas
139b831a33 Fixed scriptActionOnTarget not setting the script target correctly. Resolves the Fuel Tank OXP problem, but further testing will be required. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1266 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-08 10:00:51 +00:00
Jens Ayton
856409ed46 Added ability to explicitly bind shaders to subentity rather than root entity (backported to 1.70-m). Added support for hull heat glow to default shader (full shader mode only). Added Eric Walch's list of pre-existing roles to pirate-victim-roles.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1265 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-05 14:32:56 +00:00
Jens Ayton
c1dd9c5b1a Fix for bug where awardEquipment:EQ_TRUMBLE while a trumble infection is in progress would innoculate the player against future trumble infections. Also added code to un-innoculate existing saved games. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1264 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-04 21:43:18 +00:00
Jens Ayton
ea5d5fc9e9 Fix for error messages when loading TestRelease build of Debug OXP (Mac only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1263 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-04 17:44:06 +00:00
Jens Ayton
878f5931da Renaming oolite-mac-js-console.js to oolite-debug-console.js (1.71 only), part 1 of 2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1261 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-04 16:24:26 +00:00
Jens Ayton
0d600512a0 Updated Debug OXP for 1.70. Stopped embedding F-Script (because it was 3.5 MB of a 3.5 MB OXP, and end-users are unlikely to have a use for it); instead, the Development configuration (but not the TestRelease configuration) requires FScript.framework installed in /Library or ~/Library. Also fixed return types of some shader accessors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1260 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-04 10:50:56 +00:00
Jens Ayton
a877783cea Bumped versions for trunk and 1.70-maintenance to 1.71 and 1.70.1 respectively to help avoid confusing them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1259 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-03 18:05:21 +00:00
Jens Ayton
4546eb0baa Fix for OXP verifier turning of log message classes. Exterminated all uses of NSLog that turn up in Mac builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1257 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-03 17:53:37 +00:00
Dylan Smith
0e79b1426b use our own libjs tree during a build 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1255 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-03 15:19:11 +00:00
Dylan Smith
22350f1ba2 fix build breaks 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1254 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-03 11:50:23 +00:00
Jens Ayton
bb06b4d8b5 Removed temporary debug messages from DTD swizzler and debug console. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1252 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 21:11:56 +00:00
Jens Ayton
df05fbd65f Updated version numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1250 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 20:43:08 +00:00
Jens Ayton
eecc7753aa Fixed warning on SDL platforms due to not including NSThreadOOExtensions.h in OOOpenGLExtensionManager.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1249 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 15:23:08 +00:00
Jens Ayton
2ca470e07f Fix for bug 011691 Cancelling load game dialog handled badly, work-around for bug 011893 Full-screen mode menu input broken reinstated and cleaned up. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1248 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 14:21:46 +00:00
Jens Ayton
56eb8f1738 Renamed a bunch of script handlers and gave NPC scripts some events that only player scripts got before. Added compatibility mechanism to point out uses of old handlers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1247 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 00:50:06 +00:00
Nikos Barkas
dae0be764d Fix a very old bug, where pausing the game from a GUI screen, going to options and then unpausing the game would result in blank or messy screens (particularly evident on the two star charts). Also, changed estimated travel time to be displayed for the planets in range of current, not maximum fuel quantity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1246 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-27 07:07:48 +00:00
Nikos Barkas
665bba439c Fixed a problem in shipdata.plist, whereby the GNUstep parser was getting confused due to nested comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1245 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-25 21:24:13 +00:00
Nikos Barkas
9021639874 Fixed a bug where screen resolution settings would be internally changed in game options menu without the changes being shown on screen. Game version now is stamped on the Oolite readme file. Switched Win32 installer interface to the 'modern' type. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1244 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-24 18:50:35 +00:00
Jens Ayton
280f4d7828 Fixed some warnings in Windows build; switched cloaking device pod to use JavaScript implementation now that its script_actions are no longer needed for testing; fiddled with OOCollectionExtractors for a tool I'm fiddling with. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1243 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-24 15:58:15 +00:00
Nikos Barkas
33c8a223c7 Fixed a couple of warnings on the Windows build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1242 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 19:55:39 +00:00
Jens Ayton
6112ef39f5 Fixed a (spurious) warning in optimized builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1241 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 15:52:51 +00:00
Jens Ayton
3fbc24887d * All ships now have a JavaScript script attached, allowing JS scripts to 
add behaviours to any ship.
* Legacy script_actions, setup_actions, launch_actions and death_actions
  handled through default JavaScript script.
* In order to implement the above, JS Ship now has a runLegacyScriptActions
  method. This is not to be exposed as an "official" method, though, since
  we might want to change the mechanism -- for instance, to "compile"
  legacy scripts into JS. Handling dynamically-generated legacy scripts in
  that case would be a significant complication.
* Updates for Mac OS X 10.5 "Leopard".
  - Errors on reading/writing plist will not cause a crash if building
    against the Leopard SDK. (I have no intention of requiring Leopard any
    time soon, but future-proofing is good.)
  - OOWeakReference is now more efficient when running under Leopard, by
    implementing the new "fast forwarding" mechanism.
  - Threads now have names set under Leopard, which may provide debugging
    advantages.
  - Fixed some new build warnings for new version of apple-gcc.
  - Updated type declarations to identify Oolite saved games as property
    lists.
* Cleaned up PlayerEntityControls.m somewhat. Moved method declarations
  into files, fixed indentation, broke up monster giant method of doom.
* Script-generated asteroids now behave like system populator-generated
  asteroids (As Seen on BB[TM]).
* Minor optimizations and simplifications of legacy script engine.
* JS System.filteredEntities() now has sensible behaviour if predicate
  throws an exception: the predicate is not called again, and null is
  returned. The exception is reported and not rethrown.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1240 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 15:04:14 +00:00
Nikos Barkas
5b28eb2b2d Re-eanbled 'n' key during pause to switch all debug flags off (why did I ever disable it in the first place?). Avoid setting up unnecessary variables if we are building with procedural planet textures support and these textures have not been turned on in the game. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1239 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 14:40:08 +00:00
Jens Ayton
d031c9c437 Checked in change previous check-in depended on, and fix for compiler warning in SkyEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1238 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-19 23:55:56 +00:00
Jens Ayton
b4e42b39d0 Noticed that Mac OS X's plist tools produce a different DTD declaration under Mac OS X 10.5, and updated the DTD swizzling in OOPlistParsing to handle this case. Also generalized it so adding new DTDs is easy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1237 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-19 23:20:15 +00:00
Jens Ayton
4a776c4193 Implemented recursion limiter in AI method reactToMessage: in response to SCR crash report. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1236 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-19 18:34:28 +00:00
Nikos Barkas
39f1fd30fb Bypass two harmless, log cluttering OpenGL error reports, at the same time gaining on performance, by setting rendering.opengl.error to no in logcontrol.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1235 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-17 21:34:05 +00:00
Nikos Barkas
c060874ded Added an alternative installer script, with the same functionality as the previous, but more modern looking. Most likely, this will be the script that will be used to create the upcoming version's Windows installer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1234 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-13 15:16:51 +00:00
Nikos Barkas
6d4e87b511 Improved the looks of the Windows installer and tweaked it a bit to read the version of Oolite from the environment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1233 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-11 11:24:27 +00:00
Nikos Barkas
f7789096f3 Attempt to resolve a problem with sticky messages on certain systems, by reverting to the 1.69.1 method of handling message fade times. Updated the Oolite_Readme.txt documents to reflect the current project status. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1232 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-06 17:22:24 +00:00
Jens Ayton
44fd79dc64 Cache synthesized material dictionaries. Added sendScriptMessage: AI method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1231 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-23 07:36:58 +00:00
Nikos Barkas
413c4a143a User preferences are now saved when Oolite under GNUstep exits. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1230 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-23 06:55:25 +00:00
Nikos Barkas
de62146790 Gave SDL builds their exit option back ;-). Tidied up a little the menu handling. Enabled mouse double clicking under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1229 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-22 15:03:22 +00:00
Jens Ayton
9d9128bcb1 * Got Game Options submenu working under OS X. 
* Save reduced detail, wireframe and shader settings in preferences.
* Implemented variable shader complexity support.
Added default shader, used for all otherwise-unshaded ships with full shaders on, and for smooth ships or ships with effect maps specified in material dictionary with simple shaders.
* All ships now drawn with slight specular highlight by default (shininess = 10, intensity = 0.2) except in reduced detail mode.
* (JS) Made Ship.shipDescription read-write (except for the player).
* (JS) Added global function ExpandDescription(string : String), to perform substitutions like %H, [commander_name] and so forth. 
* (JS) Added global function RandomName(), intended to be like %R substitution. In so doing, I discovered that %R is broken, but left it as-is so it will generate the same name for existing descriptions. Added %X to do the same thing, but without the bugs. RandomName() is different from either in that it doesn't use the "predictable" PRNG, so it will provide a new name each time. To use the "predictable" variant in JavaScript, use ExpandDescription("%X"). 
* Ships that hyperspace out are no longer replenished in interstellar space.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1228 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-22 12:18:18 +00:00
Nikos Barkas
dbc9243757 Some more (hopefully last ones) mini-corrections for the options menus. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1227 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-21 18:05:55 +00:00
Nikos Barkas
0107fcf8e0 Prettified a bit the Options menus, at the same time making them more compliant with task's #003782 spec. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1226 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-21 16:39:49 +00:00
Nikos Barkas
e7c9b3ddc5 Split game options out of menu screen, as per Berlios task #003782. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1225 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-21 15:16:56 +00:00
Nikos Barkas
1fffdcbfc1 Wireframe mode has been removed from the debug options and is now a proper game option. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1224 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-19 22:16:26 +00:00
Nikos Barkas
b9b091e880 When in wireframe mode, render also the planets as wireframes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1223 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-19 19:45:42 +00:00
Nikos Barkas
440776cd50 Enabled wireframe graphics debug option. Pause the game and press 'w' to activate. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1222 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-10-19 14:29:26 +00:00