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

285 Commits

Author SHA1 Message Date
cim
bce6485b39 Add basic plist syntax verification checks to the OXPVerifier 
Doesn't check that the keys/values are sensible, just that it can be
parsed at all.

New file src/Core/OXPVerifier/OOCheckPListSyntaxVerifierStage.m will need
adding to the Mac build.
 2014-12-07 14:05:14 +00:00
cim
6f2656d446 Add new system description manager class 
For testing, it's currently used for JS reads from SystemInfo
Need to replace several other uses.
 2014-10-12 19:41:11 +01:00
cim
455c7a5523 Merge branch 'oxp-strict-mode' 
Additional validation and warning of deprecated features in test/debug builds
 2014-09-13 11:05:02 +01:00
cim
f02b75b3ae OXP run-time standards checks 
Only active in the debug build, level controlled by enforce-oxp-standards
variable (0..3 = off, warn, enforce, quit)

Initial checks that OXPs have manifest.plist and legacy script.plist
not being used.
 2014-09-07 15:14:05 +01:00
cim
fd53d87bf7 Define basic trade-goods.plist reader 2014-08-23 14:47:38 +01:00
Kevin Anthoney
88265c298c Resolve merge conflicts in Universe.m and ShipEntity.m 2014-07-05 20:42:29 +01:00
cim
14de73795e Create standalone atmosphere texture generator for planets 
Still seems to be some white-ball bugs when using the PlanetTexture generator and this will also be more efficient.

Still to do - but perhaps wait and see if this has fixed the bug - is to move some of the static functions that this has in common with PlanetTexture generator into a more sensible place.
 2014-05-04 15:43:26 +01:00
cim
43710edfeb A bit more prototyping of the ship library system 
Add shiplibrary.plist to replace and extend demoships.plist
Give automatic but overridable speed, turn rate, cargo values
Add a few test entries to shiplibrary.plist (very unfinished)
 2014-03-21 22:25:50 +00:00
Kevin Anthoney
36a0522e86 Add first draft of OpenGL matrix manager 2014-03-19 17:23:40 +00:00
AnotherCommander
1aa6022982 Merge pull request #77 from kanthoney/joystick_configurator 
Joystick configurator
 2014-02-01 06:05:57 -08:00
cim
ed7a8db979 Merge branch 'master' into oxz-installer 
Conflicts:
	src/Core/Entities/PlayerEntityControls.m
	src/Core/ResourceManager.m
	src/Core/Universe.m
 2014-01-17 21:59:26 +00:00
Kevin Anthoney
b12f205d17 massive re-jig of joystick profile code 2014-01-17 08:44:53 +00:00
Kevin Anthoney
3238d47c91 Add initial OOJoystickProfile code 2014-01-17 08:44:53 +00:00
cim
36178204f3 Start on OXZ manager. 
Doesn't work at all...
 2014-01-05 14:17:55 +00:00
Jens Ayton
c13bf0b531 Remove makefile references to old SDL sound code 2014-01-04 23:47:30 +01:00
KonstantinosSykas
19d94c807d Push Linux dependencies and update linker opts \n following zlib 1.2.3 to 1.2.8 update 2013-12-22 19:43:37 +02:00
cim
fb53a45ff2 JS interfaces to exhausts, flashers - closes #43 
ship.exhausts
ship.flashers

Exhausts and flashers both have r/w .size property and .remove() method

Flashers might get some more properties later for colour/phase/etc.
 2013-11-26 23:00:36 +00:00
AnotherCommander
95301b395c Specifically request dynamic linkage for vorbis libraries on Windows. 2013-11-20 22:39:06 +01:00
KonstantinosSykas
8b308ef10a Push Linux dependencies into oolite master following OpenAL updates 2013-11-19 00:50:49 +02:00
cim
60ef4c54ad Merge pull request #66 from OoliteProject/zipped-oxp-support 
Zipped oxp support / OpenAL
 2013-11-17 03:13:51 -08:00
AnotherCommander
2624fbf59a Enabled build of zipped-oxp-support branch on Windows. 2013-11-14 13:26:48 +01:00
cim
32b8c36787 Include v4hn's patch for Linux build process 
Fixes case where /usr/X11R6/lib contains a JS library
 2013-11-11 18:24:00 +00:00
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