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

291 Commits

Author SHA1 Message Date
Chris Morris
4040bf1080 Add OOWeakset to Linux/Windows build file 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5111 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-20 07:02:36 +00:00
Chris Morris
b66fbebcc0 Add basic JS representation of DockEntity 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5064 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-11 11:52:23 +00:00
Chris Morris
1c8a27357a Separate some docking control into separate DockEntity in preparation for allowing multiple docks per station. 
Known regression: stations without docks (but with port_dimensions/radius) can no longer dock ships.
Doesn't actually work yet with multiple docks per station (everything will be directed through the first dock, though player may be able to dock at others) but first dock should be working as before.
DockEntity.* files will need adding to Xcode project before Mac compile works.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5058 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-10 15:06:29 +00:00
Nikos Barkas
b0375084db Feature request 5496 is now in for developers' tests, has to be manually enabled (make FEATURE_REQUEST_5496=yes). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4890 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-28 17:44:39 +00:00
Marc
998ed42dd8 A_C's better no-compile-warnings fix! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4845 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-13 09:00:13 +00:00
Marc
3cfaa0515d - removed auto-import warning from windows compile, removed a type mismatch warning from mac compiles. 
- made new_atmosphere sky colour less dependant on clouds colour.
- removed unused variable.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4842 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 14:38:46 +00:00
Jens Ayton
01187e352b Added large-address-aware switch for Windows build for nightlies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4841 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-11 10:33:39 +00:00
Marc
b353faef84 A mixed bag: 
* change: specifically setting empty comms_log_gui & message_gui sections inside hud plists now resets those guis to Oolite's default. Updated standard huds accordingly.
 * bugfix: fixed crash with malformed gui declarations inside hud plists - trunk & maintenance.
 * change: internal name of commodity identifiers normalised: 'liquor/wines', 'alien items', 'gem-stones' are now expressed internally as 'liguor_wines', 'alien_items' and 'gem_stones' - in most cases the old identifiers are still recognised, for backward compatibility.
 - linux build and windows build directories separated, both can now share the same source directory without build conflicts.
 - updated copyright notice in shaders files, minor planet drawable cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4826 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-01 13:27:36 +00:00
Jens Ayton
dce3f842ce Fixed normal and parallax mapping with shader synthesizer. Player Cobra 3 is temporarily pink while using synthesizer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4765 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-08 00:34:07 +00:00
Jens Ayton
36c5304df8 Removed OOFastArithmetic.m from GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4735 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-09 09:46:18 +00:00
Michael Werle
200902f9da Applied a (slightly tweaked) patchset sent in by Nicolas Boulenguez, the Debian maintainer of Oolite. 
Changes consist of:
 - use #include instead of #import for C header files.
 - explicitly #include <assert.h> in various source files.
 - tweaks to build process for Debian.
 - deleted obsolete src/SDL/make* package building scripts.

"Works for me" - please check build process still works for you; esp. on Windows
.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4433 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-05 03:14:05 +00:00
Michael Werle
d915f5fde5 Makefiles - rework to accomodate new Javascript library 
(Combined effort from Micha, Konstantinos, and Nikos)
 + removed support for building legacy libjs
 + (Linux only) now use the MacOS update script to auto-download the JS library
     - download script failure checks tweaked for older versions of bash
 + new Makefiles:
     - libjs.make - to download & build libjs (Linux only)
     - config.make - contains shared configuration variables between makefiles
 + debian packaging rules updated to suit



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4362 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 13:24:56 +00:00
Jens Ayton
54d5c4b350 Breakpattern entity reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4266 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 19:09:22 +00:00
Jens Ayton
26cc800c6e Removed non-optional feature macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4252 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 16:13:29 +00:00
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