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

3012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
558e3439fe Equipment scriptInfo is never null/undefined. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3334 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 23:15:32 +00:00
Jens Ayton
5010e7c777 Added script_info property to equipment types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3333 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 23:07:35 +00:00
Jens Ayton
4713b70d14 Removed obsolete reference to Basic-debug.oxp. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3332 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:50:45 +00:00
Jens Ayton
4dd07e63d6 Harmonious polyphonic buy/sell sounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3331 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:37:25 +00:00
Jens Ayton
f0f02f7045 More fine-grained exception reporting for -[PlayerEntity update:]. Should probably do same for some of the bigger sub-methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3330 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:19:42 +00:00
Jens Ayton
ec1d15ddce Suppressed incoming ECM alarm while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3329 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 22:03:32 +00:00
Jens Ayton
1aeb964d12 Attempted compatibility fixes for GNUstep 1.20. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3328 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 21:57:29 +00:00
Jens Ayton
12abaa6a42 Fixed planet lighting inconsistencies (bug #17147). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3327 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 15:07:03 +00:00
Nikos Barkas
f0d0a2d07b Fixed Berlios bug #17148 (Cloaking device stays on if JS removed whilst in use). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3326 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 14:28:11 +00:00
Jens Ayton
51e49ae7fb Fixed potentially invalid (unchecked) cast of non-object jsval to object in JS timer construction (bug 17149). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3325 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 12:59:53 +00:00
Marc
0ad38f3e60 - rev3323 redux: hopefully caught all normalised/non-normalised ship values + like_ahip conflicts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3324 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-13 09:42:09 +00:00
Nikos Barkas
80858c8601 Resolved a situation where a ship dictionary containing the 'scanClass' key would be like_ship'ed to a dictionary containing the 'scan_class' key. The child dictionary now overrides the parent one correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3323 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-12 22:17:04 +00:00
getafix
c5bf3385f2 Fixed "oolite" script not passing command line arguments to "oolite-wrapper" script 
for autopackage installations (inserted in r3235). 



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3322 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-12 21:36:50 +00:00
Jens Ayton
7b5c8adef8 Disallow player.ship.explode() while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3321 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 21:55:48 +00:00
Marc
77047570b3 * Change to startup 'load previous commander Y/N?': 
- in unrestricted mode, the question is asked only if at least one save file can be found. 
  - in restricted mode, the question is asked at all times, like in Elite.
* Change to restart look & feel:
  - a spinning cobra is now shown after all restarts, like in Elite.
  - 'restricted/strict mode enabled' is now shown only when switching between strict/unrestricted mode.
* Logging of searchPaths.dumpAll now happens at startup, and if search paths change due to switching between strict/unrestricted mode. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3320 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 21:07:45 +00:00
Jens Ayton
766259e7bf Planet textures can again be changed via JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3319 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 20:41:14 +00:00
Jens Ayton
c62a2c358f Fixed bug where planets with atmospheres got metal.png texture with procedural generation off. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3318 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 20:17:17 +00:00
getafix
8ea9526f24 Fixed Linux build error following to PNG snapshot save update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3317 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-11 15:36:43 +00:00
Nikos Barkas
d67bc4dbd5 Added capability to save snapshots in PNG format to the SDL builds. The code is based on http://encelo.netsons.org/programming/sdl. Snapshots format can be set at compile time to either BMP or PNG, default is now PNG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3316 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-10 22:19:49 +00:00
Jens Ayton
efd5097efa Extra consistency checks to attempt to avoid "ERROR: status is STATUS_DEAD, not STATUS_DOCKED, but dockedStation is not nil" - player can't dock normally while dead, and player can't be destroyed while docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3315 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-10 18:41:22 +00:00
Jens Ayton
084248f98f Tiny tweaks: renamed AI methods scanFor{Nearest|Random}Merchantmen to ...Merchantman (with compatibility aliases). Removed all Light 0 stuff from shaders. Belatedly bumped cache format version for changed dust shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3314 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 23:13:12 +00:00
Jens Ayton
1d7b85b918 Slight dust shader optimization. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3313 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:37:09 +00:00
Jens Ayton
5599e4f375 More dust fun: dust box repeating is now handled in shader, so dust is now static geometry in shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3312 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 19:23:06 +00:00
Jens Ayton
7c674d3d4a Dust draws with vertex arrays, warping is applied in shader (which allows for more customization as a side effect). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3311 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 18:22:53 +00:00
Jens Ayton
946fbf2849 Fade out target direction indicator when near centre to avoid annoying jittering. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3310 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 16:35:52 +00:00
Jens Ayton
ef276aa408 Deleted old HUD icon code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3309 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:39:43 +00:00
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:21:06 +00:00
Jens Ayton
3c87985c05 Fixed crash trying to auto-dock with a station with no docking port. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3307 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 14:08:18 +00:00
Jens Ayton
423d317234 Resurrected Mac sound inspector (as part of Debug OXP). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3306 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 13:33:03 +00:00
Jens Ayton
7eba039651 Texture reset adjustment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3305 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 22:57:40 +00:00
Jens Ayton
edf647f4e5 Dust is now more subtle, especially in shader mode. It also scales smoothly instead of jumping between dot sizes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3304 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 22:51:33 +00:00
Jens Ayton
0bebabc509 Mac nightly builds: accurate detection of build failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3303 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 22:17:59 +00:00
Jens Ayton
8a55380620 Mac nightly builds: actually checked in build script, which had previously been ignored due to a local svn setting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3302 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 22:04:51 +00:00
Jens Ayton
7647d98a83 Fixed Mac build errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3301 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-08 18:41:50 +00:00
Jens Ayton
7bfc78fd57 Fixed graphics reset problems with planets by heaping a big heap of ad-hocery on top of the already large heap. Also left procedural planets on for Mac builds, let's see how that goes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3300 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 19:23:14 +00:00
Marc
4263041d78 - 'Seamless' integration between the new log lines and the log config file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3299 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 18:49:00 +00:00
Jens Ayton
8392bee4a5 Fade dust motes to clear instead of black when shady. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3298 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 18:22:53 +00:00
Marc
aa05c0eb93 - fix: proper handling of hardened missiles in strict mode 
- fix: Resources is not displayed in the list of OXPs search paths anymore.
- more strict mode logging goodness!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3297 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 13:29:14 +00:00
Marc
c521012a06 - mac menu part III: to make it easier to add OXPs to a fresh installation, the AddOns shortcut is now always enabled when in unrestricted mode, even when the directory is empty. Disabled when in restricted mode, when no OXP is accessed by the game. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3296 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-06 11:17:07 +00:00
Eric Walch
81916eee70 - fixed a possible cause of a CTD on player missile launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3295 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 21:18:31 +00:00
Eric Walch
9dcecb580a - Restored the ability of the memory expansion to put a target on a missile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3294 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 19:46:46 +00:00
Jens Ayton
2f96be77ce Playing with the log again: list loaded world scripts vertically, note end of loading spew. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3293 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 18:02:00 +00:00
Jens Ayton
0bf1a6732f Xcode project tweaks to put resources in proper subdirectories. Recommend deleting built app to avoid duplicates. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3292 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 17:46:19 +00:00
Nikos Barkas
b41ae4d829 Added missing 'OXP(s) containing messages found' message in descriptions.plist. The path of the OXP with messages echoed to the log is now the last path component only. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3291 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 17:11:41 +00:00
Jens Ayton
073b32262e Don't use named JS GC roots in release builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3290 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 17:11:11 +00:00
Jens Ayton
acda157e56 Fixed problem with chained mission screens. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3289 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 16:49:21 +00:00
Jens Ayton
ca362e50cb Rewrote screen shot log message in English. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3288 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 13:42:37 +00:00
Jens Ayton
29a4ff8c39 Disabled OOEnvironmentCubeMap, will resume post-MNSR. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3287 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 13:36:16 +00:00
Marc
b4f537f4b5 - mac menu part II, only show Screenshots & OXP directories (& previous log) if we have got anything to show. Reworked the AddOns directory preference, as agreed. 
- 3284 redux: Kilos/grams handled properly when carrying specialCargo, simpler code.
- some minor cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3286 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-05 00:33:16 +00:00
Eric Walch
5af9d5adcd - the Manifest can now change kilo/grams goods when carrying specialCargo. (Now with correction for different spellings) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3284 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-04 19:16:31 +00:00