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

2775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Walch
525bd1a234 - the Manifest can now change kilo/grams goods when carrying specialCargo 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3283 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-04 18:57:41 +00:00
Nikos Barkas
33c2214bea Changed label of AddOns folder shortcut in the Win32 installer, as X in OXP is for expansion, rather than extension. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3282 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-04 15:23:30 +00:00
Marc
481fa388de - refactored player witchspace jumps. Hopefully didn't break anything. 
- fix: player shipLostTarget event should now fire at all relevant times.
- fix: overlapping systems, appearing at the same map coordinates, should now be individually selectable. Tested on the short range map with Divees & Tezabi in galaxy 5.
- new: ship.exitSystem([systemID]) if systemID is specified, the ship will try to hyperspace to that system, otherwise it will try to hyperspace to a random system in range. Returns false if the jump cannot be made - system(s) not in range, mass blocked, etc...
- windows menu shortcuts: renamed 'Installed OXPs' to 'Extension Packs'.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3281 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-04 07:56:55 +00:00
getafix
812da41e94 GNUmakefile eSpeak distinct handling for build: 
oolite Linux with system libs (a.k.a. distro-release)
	oolite Linux with packaged libs
	oolite Windows

Updated apspec files and oolite.src to handle the new espeak-data location

Added script to generate shared libraries linker names when 
autopackaged oolite is needed. ([x86, x86_64]/lib_linker/make_so.links.sh)

Linux oolite header files cleanup.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3280 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 20:34:35 +00:00
Marc
7ec22e06ef - yet another makefile / espeak tweak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3279 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 10:12:51 +00:00
Nikos Barkas
ebc33db433 Added Oolite-related image at finishpage on the Windows installer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3278 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 10:06:28 +00:00
Marc
fae7279bcb - added shortcuts for Previous.log, AddOns and snapshots folder to mac's Oolite menu. 
- minor xcode project cleanup, hopefully I didn't remove anything important...

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3277 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 09:56:22 +00:00
Nikos Barkas
234834f712 Better espeak import library linker semantics. Removed now obsolete libespeak=yes setting from Makefile. espeak-data folder is copied in installation image under Windows only when building with eSpeak support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3276 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-03 07:11:56 +00:00
Nikos Barkas
cac50efa67 i18n'ed a spoken message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3275 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 22:51:00 +00:00
Marc
6761ad3af9 Windows installer update: 
- Added shortcuts to the AddOns, Logs & snapshot folders.
 - viewing readme file now made optional.
 - Oolite now launches automatically after installation (and after the user finishes reading the readme file, if selected).


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3274 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 22:09:14 +00:00
Nikos Barkas
0781a47bac Fixed Windows build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3273 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 21:43:04 +00:00
Jens Ayton
1c40ab56c4 Mumble mumble makefile mumble. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3272 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 20:35:18 +00:00
Jens Ayton
0477421cc6 Prototype dynamic environment map renderer. Not used for anything and has serious rendering artefacts. Requires FBOs. Trigger from console with PS.call('debugDumpEnvironmentProbe'). Also, removed texture name cache - I'm not convinced it was doing anything useful, and it exploded when faced with recycled cube maps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3271 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 20:34:41 +00:00
Marc
baa2a96e7a - added 'spoken messages' as one of the options flagged up in the log, and made it a standard option for linux & windows (already always enabled for macs). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3270 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 18:16:26 +00:00
Marc
47976d9cde * miniaturized, textured planets bugfix PartII: (see Bug #17105 & rev3262) 
- Permanet planetinfo.plist texture overrides ( texture = x.png' ) should now work correctly under all circumstances, regardless of whether procedurally generated planets are enabled or not.
- Setting planets textures via javascript ( either temporarily using planet.texture = 'x', or permanently using System.infoForSystem(galaxyNumber, planetNumber).texture='x.png' ) now works at all times, under all circumstances.
- Temporary textures for main planets are now shown on the F7 screen for as long as the temporary texture applies. (will revert to original/permanent texture after leaving the system)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3269 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 17:39:14 +00:00
Nikos Barkas
39bf0354e5 Added eSpeak support for the Windows builds. Moved espeak-data folder to cross platform dependencies. Updated default.apspec files with new location of espeak-data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3268 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 16:49:54 +00:00
Jens Ayton
69deda0865 Refactored OOTexture into an abstract class and a concrete class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3267 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 15:55:12 +00:00
Nikos Barkas
1b2e3430ed Commited the prime candidate fix for the Windows crashes situation. Let's see... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3266 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 14:34:22 +00:00
Eric Walch
73fbd204e1 Corrected bug of invisible npc laser fire added in 3259 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3265 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 14:10:29 +00:00
Jens Ayton
78f970e834 Fix for warnings in Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3264 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 12:49:51 +00:00
Jens Ayton
12016a853b Cleaned up redundant dual licensing headers as previously discussed. Gosh, there's a lot of them. Feel free to ad your name or 'and contributors' as appropriate. Also, excluded unused classes OOCamera and OOLight from build, but didn't delete them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3263 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 12:32:43 +00:00
Jens Ayton
e5ab1999d8 Fixed atmospheres for miniaturized, textured planets when procedural textures disabled. (Bug #17105) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3262 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 11:47:08 +00:00
Eric Walch
571f57098d - Corrected a calculation error in the maximum quantities for kg/g goods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3261 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 11:27:07 +00:00
Jens Ayton
65d82b8d5c Fixed clipping issues with OOLightEntities, or rather, restored to a different set of clipping issues as seen in earlier versions. (Bug #017123) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3260 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 11:17:15 +00:00
Jens Ayton
3b75e46988 Cleaner obj_dump, now with range and visibility flag info. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3259 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 10:39:19 +00:00
Jens Ayton
b77bd31cea More legible list of search paths. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3258 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-02 09:32:39 +00:00
Jens Ayton
4f5ee63561 Minor cleanuppery. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3256 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-01 17:55:01 +00:00
Marc
c0671a7dc9 - NPC missiles, backward compatibility part II: improved logging to avoid puzzling 'missile' is not a missile messages! 
- system.addShips/addGroup: improved error messages.
- comment cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3255 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-01 13:01:14 +00:00
Eric Walch
2888f9bf40 - Increasing or decreasing Manifest quantities while in flight by JS, no longer removes all pods in the players hold, only the minimum amount needed to do the job. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3254 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-30 12:53:34 +00:00
Nikos Barkas
a3f9150539 Updated SDL builds makefile with new file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3251 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-30 10:06:32 +00:00
Jens Ayton
33004ad862 Oh hey, you might want these here files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3250 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-30 09:45:41 +00:00
Jens Ayton
dd78bf3a6d Cube map textures are now converted to lat/long maps (with appropriate flipping) when GL_ARB_texture_cube_map is not available. Can be tested with disable-cube-maps preference, but note that this will break any custom shaders that expect cube maps. (Cube maps are always available if shaders are supported.) Performance concerns: well, the actual conversion process is faster than the scaling used to implement supersampling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3249 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 23:28:12 +00:00
Marc
d2b6b1aea3 - fixed a js warning bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3247 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 21:05:32 +00:00
Jens Ayton
b2bcca6cb5 Fixed crash with zero-sized flashers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3244 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 20:05:03 +00:00
Jens Ayton
404e547ced Fixed issue with planets disappearing for one frame when changing subdivision level. Consistent logging of search paths across platforms. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3243 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 19:56:22 +00:00
Jens Ayton
f48c83b674 Logging tweaks: use OOLITE_SNAPSHOT_VERSION in log header if defined; less confusing message when failing to find AI plist for a ship's initial AI; stylistic consistency for JS planet errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3242 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-29 18:51:48 +00:00
Michael Werle
949f8d2e36 * Fixed (?) broken build on Windows due to last commit. 
* Included Makefile fix from Getafix to only use libespeak for Linux builds, not Windows.
* By default, (GNU)Makefile will now build using dependencies distributed in the Oolite repository
* Added new GNUMakefile switch (use_distro_deps=yes/no) to use locally installed header files and libraries


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3237 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-28 17:02:16 +00:00