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

191 Commits

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
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
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
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
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
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
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
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
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
926260dd38 Renaming. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3179 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:59:35 +00:00
Jens Ayton
ab623a5c94 * Big unified emission and illumination map thingy for non-shader mode. Known 
limitations:
  - causes synchronous wait for component textures to load.
  - Component textures are cached unnecessarily.
* cleanup of material dictionary handling.
* Added foo_color variants of material colour key names.
* Added illumination_color material property.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3178 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-21 18:21:29 +00:00
Jens Ayton
1b8bcde3c8 Redundancy in makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3168 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 07:34:34 +00:00
Nikos Barkas
133388d957 Fixed build on Win/Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3166 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-16 06:22:46 +00:00
Jens Ayton
ca06516f4c Cleaned up texture pixel-twiddling code a bit. Added extract_texture texture option (for, e.g., using one channel of a shader effect map as a glow map in non-texture mode). Mac: renamed custom static libpng to libpng_for_oolite, to avoid linking to wrong library when normal libpng installed in /usr/local/lib. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3165 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-15 23:51:41 +00:00
Nikos Barkas
2dd40c216c Updated GNUmakefile with most recently added files. This fixes crash at startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3161 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-13 07:30:06 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +00:00
Jens Ayton
94d00e8086 Followup to r3049: second occurrence of same mistake. Also, fixed a typo in a makefile comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3050 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 23:22:32 +00:00
Nikos Barkas
b5efda4c21 Upgrading libpng to version 1.4.0 for the Windows build. Ships now are considered as executing a spawn action also when launched for the first time. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3023 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-02-14 02:00:53 +00:00
Jens Ayton
4284da31cd Ships with the same model but different material dictionaries now work properly. Changed mechanism for saving and restoring wormholed ships. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2994 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-01-23 22:20:55 +00:00
Marc
bb93c112da - yet more go-faster tweaks to the texture generator. 
- integrated the previously separate atmosphere generator inside OOPlanetTextureGenerator, to avoid noise generator overheads.
- added NEW_ATMOSPHERE compile-time switch to OOPlanetEntity.

- tidying up of contract market generators: while they're still slow, some dead code was removed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2918 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-30 09:17:01 +00:00
Marc
44df4a0f56 - oops! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2868 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-12-10 00:38:24 +00:00
Nikos Barkas
d4ecb1f3e3 Removed reduntant entry in GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2809 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 22:58:06 +00:00
Jens Ayton
5ddbe997b1 New planets now have procedural diffuse maps. Unfortunately, the generator seems to hang from time to time. Incidentally, the log entries saying Dequeued generator <OOPlanetTextureGenerator 0x133d7bcf0>{{(null) -- failed}} are not an actual failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2807 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 21:57:57 +00:00
Nikos Barkas
cba7d4f041 Enabled building with NEW_PLANETS defined on SDL builds. Fixed a warning in OOPlanetEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2805 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 18:12:33 +00:00
Jens Ayton
7754f83cb7 Oops! That last commit wasn't really ready. Here's the rest of the fix, along with some half-baked new planet stuff (disabled with NEW_PLANETS in Universe.m). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2803 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 16:48:14 +00:00
Nikos Barkas
8f9c581505 Fixed SDL build for the new planet drawables system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2801 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-29 15:43:13 +00:00
Jens Ayton
878f382106 Split suns out into a separate SunEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2792 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-28 14:17:57 +00:00
Nikos Barkas
e1c1924e9e Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 16:18:23 +00:00
Jens Ayton
5dd0443728 Refactored AI GraphViz stuff for slightly better legibility and put it in its own file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2743 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-14 14:29:42 +00:00
Michael Werle
aa0821047a Added -Wall to compiler options for Linux 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2680 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-17 15:03:05 +00:00
Jens Ayton
bc3a113b0f Incomplete support for general polygons in missile icons. (In case of splodey, setting the OLD_ICONS macro in HeadUpDisplay.m to 1 will revert to the old drawing code.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2661 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-10 12:23:24 +00:00
Marc
47f9f2c920 * corrected manifest miscount when ship in flight. 
* last change to player.ship.manifest: manifest.food & similar are now read/write manifest quantities. Internally all commodities are now going to be referenced by the canonical identifiers, commodities.plist still overrides the displayName - the .manifest.list array is unchanged, and still read-only.
* renamed 2 ship properties for consistency: ship.availableCargoSpace & ship.cargoCapacity now become ship.cargoSpaceAvailable & ship.cargoSpaceCapacity.

- more code tidying.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2637 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-10-06 09:09:08 +00:00
Jens Ayton
251bdb1b07 Cleaned up some junk, and added missing files to makefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2605 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-25 19:57:46 +00:00
Nikos Barkas
e4138c6906 Fixed Windows build (timeGetTime definition was missing). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2549 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 17:08:14 +00:00
Jens Ayton
426815f740 Freed ECM blasts from their ParticleEntity bonds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2546 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 16:06:33 +00:00
Jens Ayton
7fa48675ab Rolled back Windows dependencies for pthreads (no longer used). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2543 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:22:11 +00:00
Jens Ayton
ec4aa91753 Spent several hours worrying about the need to deep copy data before async cache flush and the performance implications of doing so, then realised there was no reason that would be necessary. Currently back to async flushing without deep copy, and profiling code. The profiling timer implementation for Windows is untested and may be broken. Also, fixed a nasty bug in OODeepCopy() where empty dictionaries ere turned into sets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2541 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-20 14:02:55 +00:00
Nikos Barkas
5bf7e028fe Bringing Oolite Windows up to date: Added required pthread library dll, headers and import lib to project. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2539 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 23:37:38 +00:00
Jens Ayton
c988131375 Data cache writes are now asynchronous, for great snappy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2537 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 22:03:36 +00:00
Jens Ayton
c090222c17 Abstracted away testing of different NSNumber types. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2527 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-19 17:52:38 +00:00
Jens Ayton
712097c550 Gave sparks the slimming treatment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2480 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-12 10:44:29 +00:00
Jens Ayton
8a9c0b0551 Factored exhaust plumes into a separate class. Moved instance variables used only by exhaust entities into said new class, saving several megabytes of memory. Added Entity memory consumption (not including drawables and materials) to FPS display as a graphic reminder that they're still too big. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2467 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 23:13:20 +00:00
Jens Ayton
ea629fbeb4 Beginning of a lightweight replacement for ParticleEntity, currently used for flashers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2415 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-06 19:07:53 +00:00
Jens Ayton
15dae1b410 Random unexpected feature of the week: refactored texture loading dispatch into a separate class (instead of class methods in OOTextureLoader), and added an implementation that uses NSOperationQueue rather than hand-rolled thread pool if available (OS X 10.5, GNUstep 0.19). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2381 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-04 17:28:59 +00:00
Jens Ayton
6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 23:09:22 +00:00
Jens Ayton
999fe7e969 Trying to convince svn that this deleted directory is really deleted. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-29 22:50:59 +00:00
Jens Ayton
8f31c44b21 Changeged various option macros to use 0/1 convention instead of undefined/defined convention. Moved definition of these macros into an xcconfig file when building for OS X, so that their definition is shared with the debug OXP and is the same across configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2298 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-21 19:46:53 +00:00
Nikos Barkas
722b229202 Added watermark text for the snapshot versions. Currently working on Windows. The idea is to use the snapshot releases for things like nightly builds or distributions of the game other than the official ones. Updated the readme of the Windows version to reflect current project situation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2234 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-07-11 16:09:53 +00:00
Nikos Barkas
688d186508 Made incoming missile targeting a default build option. A clean project rebuild is recommended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2180 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-19 07:59:20 +00:00