163 Commits

Author SHA1 Message Date
cim
b9c5d331f2 Update contributors list for recent patches 2013-11-29 18:49:08 +00:00
cim
0a0bff2dbf Update CHANGELOG 2013-11-17 16:50:23 +00:00
Jens Ayton
721385aeb6 Merge remote branch 'origin/master' into zipped-oxp-support
Conflicts:
	Mac-specific
	Oolite.xcodeproj/project.pbxproj
2013-11-08 19:09:03 +01:00
cim
4ae7092aa3 Update contributors list 2013-11-07 19:53:38 +00: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
3357c24644 New ship models and textures as provided by Griff and CaptSolo
(Don't forget to git submodule update to get the texture files themselves)
2013-10-24 21:04:41 +01:00
cim
5fb3ab2826 Update ReadMe file and regenerate PDF
Cherry-pick of 43a24cf, dcee585
2013-09-29 19:03:31 +02:00
getafix@oolite.org
52b6c2b8ab Updated terrastorage network name to terrastorage.dyndns.info
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5695 127b21dd-08f5-0310-b4b7-95ae10353056
2013-09-07 18:34:50 +02:00
cim
4db315de16 Update changelog 2013-08-27 09:29:12 +01:00
cim
d762c7a39f Update CHANGELOG 2013-06-17 20:35:12 +01:00
Chris Morris
c7880a1de2 Fix crash reported by richard.a.p.smith on long manifest screens
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5675 127b21dd-08f5-0310-b4b7-95ae10353056
2013-05-04 13:05:59 +02:00
Chris Morris
5afcfeeb67 Impact damage (and other sorts) now no longer give kill awards / bounty while cloaked.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5661 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-25 22:25:32 +00:00
Jens Ayton
f247e955ef Fixed sound glitch in guiclick.ogg.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5660 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-24 13:30:40 +00:00
Chris Morris
8478849a50 Fix some update-related bugs for the player autopilot
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5656 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-23 10:26:24 +00:00
Chris Morris
f94614660b Zero velocity on restart and launch, stop autopilot on death
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5655 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-22 20:09:32 +00:00
Chris Morris
2c45d6ecde Fix ghost ship bug with defense targets
Fix non-frangible subentities taking heat damage 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5652 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-18 17:49:20 +00:00
Chris Morris
14f8bf19af Fix contract reputation so that it uses -7 to +7 range as documented rather than -3 to +7 range
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5647 127b21dd-08f5-0310-b4b7-95ae10353056
2013-03-05 18:36:52 +00:00
Chris Morris
e4801d7919 Use more sensible types in station.market
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5645 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-28 20:39:16 +00:00
Chris Morris
d6da46b9f4 Fix validation bugs in interface creation
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5644 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-28 19:39:56 +00:00
Chris Morris
0e543049bf Commit PhantorGorth's fix for cancelHyperspaceCountdown bug
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5642 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-18 22:40:50 +00:00
Chris Morris
a81a0f10cf Fix edge-case for main station damage
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5635 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-09 09:34:44 +00:00
Chris Morris
49ba30ef4a Player's shields also protect their subentities
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5634 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-09 09:18:03 +00:00
Chris Morris
24bdc6ca24 Fix fleeing routine, at least for accuracy >0
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5633 127b21dd-08f5-0310-b4b7-95ae10353056
2013-02-09 08:50:46 +00:00
Chris Morris
9e84db9765 Fix argument handling in Linux wrapper script
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5627 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-27 17:04:33 +00:00
Chris Morris
470bbc7f2f Reset autopilot status properly on death.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5619 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-18 19:28:59 +00:00
Chris Morris
86c45e457c More fixes:
- guiScreenChanged now fires when launching
 - yaw momentum zeroed when launching


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5617 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-14 18:44:47 +00:00
Chris Morris
958d456fa7 Fix quaternion constructor to produce identity quat with no parameters
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5616 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-14 18:17:43 +00:00
Chris Morris
31cbb6e8f5 Fix mission screen disallowing exit when HUD off.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5615 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-14 17:54:56 +00:00
Nikos Barkas
349626c8ca Documented fix for SDL_mixer.dll.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5608 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-06 21:22:46 +00:00
Chris Morris
507486972e Update Changelog for last few bug fixes
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5598 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-01 18:32:16 +00:00
Eric Walch
8398aaf497 Bumped version date for the documentation files
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5597 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-01 13:53:54 +00:00
Eric Walch
a471ada1f6 Updated documentation.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5583 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-19 10:08:30 +00:00
Chris Morris
a5de3cbfb0 Add missing AI command to changelog, alphabetise, cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5582 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-18 13:33:50 +00:00
Eric Walch
feb449020e Updated pdf version of documents
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5580 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-16 10:50:22 +00:00
Chris Morris
702549fe98 Avoid wormhole bugs in zero-distance doubles by preventing wormholes being open both ends at once.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5574 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-13 20:08:33 +00:00
Chris Morris
1cb788e9c4 ship.maxEscorts property variable between current group size and MAX_ESCORTS
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5569 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-09 21:31:56 +00:00
Chris Morris
7bcf53f299 Try again to fix exhaust plume bug: don't draw if travelling too slow for updates.
Update Changelog with recent script additions


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5567 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-09 17:35:37 +00:00
Chris Morris
f38be5a916 Add Cmd. Cheyd's patch for begin/cancel hyperspace JS events, and read access to ship's witchspace spin time.
Update contributors list accordingly.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5561 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-05 22:18:09 +00:00
Eric Walch
54d1311a81 Corrected old typo and 3 borders.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5560 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-05 22:00:40 +00:00
Eric Walch
983ba72057 Updating documentation
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5559 127b21dd-08f5-0310-b4b7-95ae10353056
2012-12-05 20:33:13 +00:00
Chris Morris
086149981f PS.missilesOnline property (ident/missile mode detection)
Alphabetise script property/method/handler lists in changelog


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5550 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-29 11:09:31 +00:00
Eric Walch
5e20f899c0 Updated reference sheet and corresponding pdf
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5528 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-23 21:57:23 +00:00
Chris Morris
c30778b3b5 Update planetinfo.plist to preserve 1.76 planet descriptions
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5523 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-22 22:42:15 +00:00
Eric Walch
c80aa76af4 Updated docs with mac changes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5522 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-22 21:51:33 +00:00
Nikos Barkas
41267a8aeb Added ZygoUgo to contributors list. Minor clean up on startextures.plist.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5506 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-17 10:20:42 +00:00
Nikos Barkas
e693c8f3ae With creator's permission, added ZygoUgo's new star textures in the core resources.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5504 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-16 16:31:50 +00:00
Chris Morris
1a542a3c4b Combine 1.77 bug fix sections in changelog, make spelling consistent.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5498 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-13 22:02:31 +00:00
Nikos Barkas
938bcb59bb Added missing 1.76->1.76.1 changes part in Changelog.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5494 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-13 12:39:04 +00:00
Chris Morris
b8761626c0 mission.exitScreen r/w property (only useful to set from callback)
mission.screenID property (set from screenID property in runScreen)
Built-in interfaces set a screenID 
Update Changelog.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5485 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-12 15:01:07 +00:00
Chris Morris
ce5eae2096 Enable: 'b' secondary activation key for equipment (timer's patch)
Disable: NEW_PLANETS (not going to be ready for 1.77; maybe next time)
Fix: scan class initialisation bug for demo ships
Fix: cloud initialisation bug for textured old planets
Add: frustum culling support for old planets
Update: ReadMe, Reference Sheet source files (PDFs not yet rebuilt)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5484 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-11 22:33:41 +00:00