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

2655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Werle
970d597b71 Fix GNUmakefile for standard Debian builds. 
NOTE: This fix may break the linux binary package build.  Check out the new 'getafix' section to see how this might be fixed.  It may require additional targets in the Makefile.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3236 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-28 15:36:17 +00:00
getafix
8416e97450 Added apspec files missing from r3233. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3235 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-28 11:55:31 +00:00
getafix
de60dba4e3 Transparent linux-x86, linux-x86_64 build and autopackage-packaging with 
new Linux-deps folder (ready for distro independent build) and 
updated Makefile, GNUmakefile and autopackage apspec files

Speech support with eSpeak compiled using PulseAudio instead of the default PortAudio.
(Smoother inter-distro speech execution when eSpeak does not use PortAudio)

Fixed oolite-update to include itself during updates

Fixed oolite wrapper-scripts not passing command line arguments to oolite executable

Updated Linux README.TXT, PLAYING.TXT files

Dependency libraries updates:
   gnustep-base-1.18 - VSync issue addressed (noticed on nVidia cards). Fixed the tearing issue enabling smooth video scrolling.
   SDL-1.2.14
   libpng14
   eSpeak-1.43.03 - Supports klat voices

Deleted Linux-x86-deps/
Deleted installers/autopackage/default.apspec



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3233 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-28 09:37:38 +00:00
Jens Ayton
85dd68422f Fixed texture corruption on graphics reset, and enabled reloading of textures from files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3228 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 18:52:39 +00:00
Jens Ayton
6ca55f587e Added logging of shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3227 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 18:24:16 +00:00
Marc
e933d9e007 - Oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3226 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 08:13:35 +00:00
Marc
55055ff04b * NPC ships: 
- new & improved aft plasma cannons.
  - own cloaking device is now affected equally by aft & front weapons.
  - OXP backward compatibility: non-equipment NPC missiles should now work as per 1.65-1.73.4.
* equipment: corrected strict_mode_only / strict_mode_compatible logic muddle.
* windows splash screen: minor code cleanup.
* minor ShipEntity code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3225 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-26 08:04:11 +00:00
Eric Walch
87422d10be - another fix to scripted_cargo so that it now also works correct as before with any scoopeble object. (like escape pods and alloys) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3218 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-25 10:51:29 +00:00
Jens Ayton
2cc1846926 Compile-time option for OOTexture to reload textures from files on graphics reset instead of keeping an otherwise unused copy in memory, but disabled because it exacerbates problems with textures getting confused on graphics reset. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3217 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-25 10:44:24 +00:00
cmdrjames
07d8cfeb53 autorelease an id 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3212 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-24 12:01:15 +00:00
Eric Walch
f4e872077a - Increased the strength of the Constrictor a bit when fighting against more experienced players. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3210 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-24 08:32:23 +00:00
Eric Walch
4ddc56153a - Fixed a sometimes not executed "shipSpawned()" event for scripted cargo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3193 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-22 19:05:26 +00:00
Jens Ayton
66fbfc1c1c ...and logging of texture size limits. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3192 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-22 13:54:23 +00:00
Jens Ayton
889c86aa47 Added logging of texture rescaling. Changed all textureLoader.foo log message classes to texture.load.foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3191 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-22 13:49:50 +00:00
Jens Ayton
6a33540423 Consistently use _ARB constants for cube maps; allow explicit texture on main planet when building without precedural textures. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3190 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 22:58:13 +00:00
Jens Ayton
b2ac436050 Hacked in cube map support for planets. Hacked out unused bits of TextureStore. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3189 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 21:40:50 +00:00
Jens Ayton
53451ce803 Re-disabled OOCombinedEmissionMapGenerator debug dumps. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3188 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 20:51:45 +00:00
Jens Ayton
885a36f43f Fixed illumination_map and normal_and_parallax_map for default shader. Added non-shader emission/illumination test cases to material test suite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3185 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 20:49:21 +00:00
Eric Walch
5e87307df4 The ship_key "cargo_carried" now also accepts the string SCARCE_GOODS and PLENTIFUL_GOODS in addition to the specific commodities to "pre-load" the ship with containers that are scarce or plentiful at the local market. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3184 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 20:07:52 +00:00
Jens Ayton
60d0c2df86 DEBUG_NO_SHADER_FALLBACK now forces shaders on all meshes in simple shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3183 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 19:56:49 +00:00