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

227 Commits

Author SHA1 Message Date
Jens Ayton
a61d8db295 Turned remaining ParticleEntity flavours into OOParticleSystem, no longer based on OOSelfDrawingEntity. Only remaining OOSelfDrawingEntity is now OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4244 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 21:03:10 +00:00
Jens Ayton
342fbcae27 More ParticleEntity breakupage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4241 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 18:58:34 +00:00
Jens Ayton
badd140260 Gave quirium cascades an entity class of their very own. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4239 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 17:35:50 +00:00
Jens Ayton
2ad5277d7b Renamed confusingly-named RingEntity to OOBreakPatternEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4237 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 15:38:02 +00:00
Nikos Barkas
6415676c0e Reverted previous bad fix and enabled build in the proper way, as per r4224 instructions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4228 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 16:25:11 +00:00
Jens Ayton
4ade099cec Reduced laser memory usage by a factor of 850. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4207 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-31 22:26:06 +00:00
getafix
535c6b90c1 Removed OO_NEW_JS definition from GNUmakefile for Linux builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4202 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-30 19:33:35 +00:00
Nikos Barkas
62579128ca Removal of old JavaScript from the Windows port. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4200 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-30 18:58:14 +00:00
getafix
05087b9427 Fixed MOZ_TRACE_JSCALLS warning on Linux builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4192 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-30 13:04:28 +00:00
getafix
ecc939e70d Updated Linux ports (i.e. 32bit & 64bit) to build with JavaScript engine 4.0b10. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4190 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-30 12:23:39 +00:00
getafix
16077685a5 Detach Linux builds from using /deps/Cross-platform-deps/SpiderMonkey source. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4179 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 18:17:47 +00:00
Jens Ayton
4ef5f4a8b0 New JS method global.defaultFont.measureString(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4129 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 18:24:52 +00:00
Jens Ayton
027dbea907 Renamed OpenGLSprite to OOTextureSprite for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4122 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 13:53:52 +00:00
Jens Ayton
c02738ce19 Linux fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4075 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 18:08:49 +00:00
Jens Ayton
96c9b7dbe6 More macro madness! JS scanClass and status strings are now interned singletons, for efficiency and also simpler callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4073 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 17:49:14 +00:00
Jens Ayton
a804bf350f Moved some enum definitions into separate table files, to avoid potentially bug-inducing redundancy (because I'm going to add more of that). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4072 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 16:14:34 +00:00
Jens Ayton
56f5e760ce Implemented frame callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4035 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-08 17:03:04 +00:00
getafix
05fc6fd088 Switched Linux nightly 32bit build to the new JavaScript engine 
for testing purposes:
* A pre-built library is temporarily used at this phase.
* Method JIT (JaegerMonkey) is supported.
* Only deps-release-snapshot Oolite build mode should be affected.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3983 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-03 21:50:00 +00:00
Nikos Barkas
35a85cc0b6 Switched Windows build to the new JavaScript engine. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3932 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-31 00:18:59 +00:00
Nikos Barkas
309b1b7d0f Added the optimized versions of the new JavaScript library for the Windows port, for mega-speed effect. The Winodws build can now automatically pick the correct JS DLL when pacakging up the installation image. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3903 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-24 11:04:03 +00:00
Nikos Barkas
82fa7788f3 Switched Windows build back to using JS 1.70 for now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3900 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-21 23:40:20 +00:00
Nikos Barkas
ff2229b9a6 Added new JS binary, headers and import library to the Windows build. New or old JavaScript to be used can now be selected and set from the GNUmakefile, under the JS_ECMAv5 setting. The Windows build is now set to use the new JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3899 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-21 21:54:43 +00:00
Jens Ayton
631e127cd0 Makefile update with less stupidity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3879 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 18:20:15 +00:00
Jens Ayton
05999d2945 Makefile update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3878 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 18:19:31 +00:00
Jens Ayton
3a463348bb Joystick refactoring. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-18 14:56:39 +00:00
getafix
92b0b82ab4 Removed Linux PulseAudio dependency (trunk & maintenance). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3687 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-19 11:17:28 +00:00
Jens Ayton
32e1884e05 Groovy yet horrible macros to automate conversion of ObjC macros to JavaScript macros, and also profile individual native callbacks. More info in the Top Secret Mailing List Treehouse. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3586 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 18:07:47 +00:00
Nikos Barkas
a88e0b5838 Fixed Windows build, at the same time removing some duplicate headers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3551 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-16 09:26:54 +00:00
Michael Werle
01322db4ee + Add JS_OPT=yes/no command-line parameter to (GNU)Makefile. Determines whether to compile/link with Optimised or Debug version of Spidermonkey. (Default optimised) 
+ Disable NSOperation for GNUstep builds for now.  Current GNUstep (up to trunk) only has an incomplete implementation of it.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3478 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-06 22:05:16 +00:00
Jens Ayton
3cafc40ed8 Switched PlanetEntity over to OOTexture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3460 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 15:25:08 +00:00
Michael Werle
9ac5d02bed Revert the GNUmakefile to compile, by default, using system-dependecies. This makes it easier for developers rather than packagers. Associated changes to not break packaging build rules. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3448 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-02 19:14:29 +00:00
Jens Ayton
8a9a1e7b83 Added new debug function: console.writeMemoryStats(). Estimates total memory use by entities and textures, and how much texture data is visible (i.e. relevant to GPU swapping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3434 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 14:51:13 +00:00
Jens Ayton
a7cf62d05f Support for GPU-specific settings. Dust now works/isn't slow (depending on platform) on GMA9xx. Default shader mode is now FULL except on 9xx/GeForce 5200. Full shader mode is disabled on GMA9xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3339 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:45:10 +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
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
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