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

263 Commits

Author SHA1 Message Date
cim
3b8e651e67 Music now works as well. 
Reading sounds from oxz sort-of works, until it needs to be replayed. Can't really seek from the ZIP stream easily, so will need to work around it
 2013-10-31 18:04:25 +00:00
cim
d67bfb6c94 Merge branch 'master' of github.com:OoliteProject/oolite into zipped-oxp-support 
Conflicts:
	GNUmakefile

Merge upstream now or this will be messy later with the windows deps
 2013-10-31 14:02:45 +00:00
cim
f00d3bd2fe Start work on OpenAL support 
(Really doesn't work as of this commit...)
 2013-10-31 14:00:18 +00:00
AnotherCommander
45b67a0d3b Update of Windows dependencies for x64 support step 1: Removal of old dependencies. 2013-10-31 09:06:57 +01:00
cim
4cb1c4a2d1 Begin work on OXZ support 
OXZ files are detected by ResourceManager and added to search paths. Plist files may be read from there into NSData objects.

Other file types not yet supported for reads from OXZ.

License files updated to include MiniZip license.
 2013-10-27 12:49:15 +00:00
cim
cbc0ac982e JS representation of waypoints 
Change waypoint addition syntax to (label,position,orientation,definition) so that intuitive way of specifying position and orientation works.
 2013-10-02 21:54:44 +01:00
cim
23b5edea58 Initial implementation of waypoints 
Try something like this to test.
S.setWaypoint("test", { position: [3E5,3E5,0], size: 5000, beaconCode: "T", beaconLabel: "Waypoint 1" });
 2013-10-01 21:48:02 +01:00
cim
fb5734dba5 New explosion effect 2013-09-22 19:55:42 +01:00
AnotherCommander
59c4c5fa6e Fix warnings on GCC on Windows. Also, free of charge optimization: -mtune=generic for the Windows builds. 2013-09-02 18:03:55 +02:00
cim
631126494c Upgrade world-space coordinate vectors to double-precision (issue #22) 
Introduces several bugs, probably.
 2013-07-02 18:43:59 +01:00
cim
68cbeed17b Start system populator framework. 
Adds buoys, nothing else
 2013-07-01 13:46:13 +01:00
cim
bc97187a11 Add read-only representation for wormholes (issue #34) 
wormhole.arrivalTime
wormhole.expiryTime
wormhole.destination
wormhole.origin
entity.isWormhole
 2013-06-30 10:22:15 +01:00
Jens Ayton
49b2dab38f Further fix Linux SpiderMonkey stuff 2013-05-14 01:22:49 +02:00
Nikos Barkas
b16690139b Upgrading to GCC 4.7.1 on Windows: Checking in new binary dependencies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5556 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-04 17:05:47 +00:00
Chris Morris
0301dd6959 Enable OO_GL_CHECK_HEAVY in debug builds (SDL) 
Fix splash screen GL settings (SDL)
Remove obsolete shipdata.plist line


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5456 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 21:29:27 +00:00
Jens Ayton
fca44fedb2 Clamped down on pointless doubles in text drawing and HUD. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5454 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 18:27:27 +00:00
Jens Ayton
ae709384c0 Initial implementation of new string expander, as per 
http://www.aegidian.org/bb/viewtopic.php?f=4&t=12615

Currently, it's shimmed into the old code to enable easier rollback. I have a
local branch where it's better integrated and will check that in when any
obvious kinks have been worked out.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5394 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-05 20:34:14 +00:00
Jens Ayton
797cb2f7ee Renamed Geometry to OOMeshToOctreeConverter and documented it a bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5386 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 14:56:44 +00:00
Chris Morris
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens. 
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 19:49:53 +00:00
Chris Morris
44f1494b13 Initial addition of "Visual Effect" entities. 
- effectdata.plist defines them
 - VisualEffect JS representation
 - System.addVisualEffect()
 - System.breakPattern and Station.breakPattern properties to allow override of usual break pattern
 - No appearance on scanner yet
src/Core/Entities/OOVisualEffectEntity and src/Core/Scripting/OOJSVisualEffectEntity will need adding to XCode project, please.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5212 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-19 17:09:51 +00:00
Jens Ayton
580d56ada4 More mouse handling refactoring; mockup of desired Mac cursor behaviour, but cursor needs to be re-obscured after a timeout in keyboard flight mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5208 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-18 17:39:40 +00:00
Jens Ayton
3bba72a852 Split up GameController in preparation for modernized Mac full-screen support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5167 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-05 19:31:24 +00:00
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