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

4345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
31ae2a66c0 Full screen refactoring: OOFullScreenController subclass now used for Mac 64-bit dummy full screen mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5183 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 18:30:36 +00:00
Jens Ayton
15be2b134f [Mac] Leopard compatibility fix. No closures for Smeagol. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5182 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-14 17:54:50 +00:00
Jens Ayton
5405d6da12 Cleaned up refactoring cruft. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5181 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:59:20 +00:00
Jens Ayton
e1160cad38 More refactoring of full screen stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5180 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:38:49 +00:00
Jens Ayton
d33ed4226b [Mac] Changed title of full screen menu item to Enter Full Screen and shortcut to control-command-F to comply with current human interface guidelines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5179 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-13 20:38:26 +00:00
Jens Ayton
4b7f6b09d6 Clang pedantry strikes again! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5178 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-12 10:14:52 +00:00
Chris Morris
31a82244a3 More sensible output of mission.markedSystems 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5177 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-11 12:37:08 +00:00
Chris Morris
cb32ded133 Modify mission destination marker to take int or object. Int should be fully backward-compatible with 1.76 behaviour now. Object allows more flexibility. 
Change default marker type for cargo/passenger contracts.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5176 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-11 12:04:25 +00:00
Jens Ayton
c283c03ce4 Minor optimization and cleanup of AI dispatch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5175 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-11 11:55:33 +00:00
Jens Ayton
e33280df7e Fixed Mac build problem due to ambiguity of -position sent to id, and associated cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5174 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-10 14:13:44 +00:00
Chris Morris
a5189459d6 Experimentally modify aim_tolerance calculations to be based on angular size of target rather than within collision radius. Makes bad shots worse and good shots better, though the effect is relatively subtle. Mainly just stops even good shots getting stuck firing an entire laser charge a consistent 30m too high: now they will alternate which side of you they miss a bit more... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5173 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-09 20:45:14 +00:00
Jens Ayton
696b2ac555 Changed various planetTex.temp log messages to texture.planet.generate.foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5172 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-07 20:00:19 +00:00
Jens Ayton
88e8cf5507 Plus de fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5170 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-05 21:22:11 +00:00
Jens Ayton
1f3394cdf3 Le fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5169 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-05 21:11:36 +00:00
Jens Ayton
c5ca2ea61a Dummy full screen mode code for 64-bit Macs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5168 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-05 20:09:43 +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
6cf87ddc2a Fix some speeds in attack routines. 
Make sure pirate escorts will redeploy properly in extended fights


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5166 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-05 12:06:20 +00:00
Chris Morris
c3c20ebf84 Fix off-by-one in mesh rescale 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5165 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-04 08:43:17 +00:00
Jens Ayton
9e54417eec More fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5164 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-02 20:32:59 +00:00
Jens Ayton
2b020d9f52 More build fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5163 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-02 19:09:08 +00:00
Jens Ayton
02fbda615c Build fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5162 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-02 16:54:50 +00:00
Jens Ayton
0984b1cb58 (Re-?)added documented but nonexistant -[Entity relativePosition] (uniform bindable). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5161 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-02 16:27:35 +00:00
Jens Ayton
8e21c62714 Cleaned up some legacy cruft. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5160 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-02 00:04:47 +00:00
Jens Ayton
e1184e4aaa Fixed deprecated load/save dialogs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5159 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-08-01 12:31:51 +00:00
Jens Ayton
89c15029b5 [Mac] 64-bit deployment target is now 10.6. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5158 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-31 20:44:09 +00:00
Jens Ayton
2b4e3e7127 [Mac] Fixed OpenGL error during loading on 10.8. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5157 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-31 20:36:33 +00:00
Jens Ayton
f07ffd27d6 More static analyzer fixes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5156 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-31 20:10:38 +00:00
Jens Ayton
760dd7c2c5 Deleted nonsense cleanup code for dock launch queues - launchQueue contains ships, not UIDs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5155 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-31 19:12:36 +00:00
Jens Ayton
f1069380ce Cleaned up some patterns causing static analyzer issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5154 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-31 19:11:56 +00:00
Jens Ayton
64448a6d25 JS Ship defenseTargets and escorts are now empty arrays rather than null when empty (simpler for clients and conforms with documentation). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5152 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 23:17:07 +00:00
Jens Ayton
a9c0e85649 Use OOWeakSet for ship defense targets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5151 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 23:13:55 +00:00
Jens Ayton
c24d971705 JS mission.markSystem()/unmarkSystem() now return undefined instead of their function objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5150 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 22:35:05 +00:00
Jens Ayton
f412133fb5 Fixed three memory leaks; cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5149 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 22:34:21 +00:00
Chris Morris
682c4feb98 Missing setting of found target 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5148 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 10:22:41 +00:00
Chris Morris
721831a100 Missing file from last commit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5147 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 08:17:27 +00:00
Chris Morris
f6ebef160f Include collision radius of witch buoy in calculation of safe exit distance. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5146 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 07:30:42 +00:00
Chris Morris
33b66ac772 Correct type signature. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5145 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-30 06:56:46 +00:00
Chris Morris
ae84915d19 Some AI changes and related tidying: 
1) Make pirates with full holds (and other offenders using route1traderAI) less likely to go to main station, especially not fugitives. (Expansion of changes from r4770)
2) Experimentally ensure always at least one rock hermit in all non-nova systems. If normal generation does not place a hermit, one is added well away from all spacelanes.
3) New "ATTACKER_MISSED" AI event for when a ship tried to shoot a laser at its target but narrowly missed. Many stock AIs modified to treat this as a hostile action.
4) Tidy function/property names in docking code
5) Add checks for cloaking in some AI routines
6) Use weak refs rather than universal ID for targeting, and clean up


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5144 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-29 20:21:11 +00:00
Jens Ayton
267276263e [Mac] HiDPI icon for saved games. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5143 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-29 17:17:53 +00:00
Chris Morris
844e9139bc Fix typo preventing unmarking of systems by legacy script code 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5142 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-28 18:44:18 +00:00
Jens Ayton
dd8977752e Removed a test message left in by accident. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5141 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-28 17:23:43 +00:00
Jens Ayton
31129eaac4 Updated some currently unused Xcode settings to recommended defaults. Renamed shared Xcode schemes so as to stop confusing the poor mailing list commit hook. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5140 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-28 14:43:57 +00:00
Jens Ayton
90fe22a980 Updates for Xcode 4.4 and Apple LLVM Compiler 4.0 (~= clang 3.1): 
* Fixed numerous format string problems, many of them real bugs.
* Added format attribute to OOLog, and fixed more format string problems.
* Cleaned up misuse of +[NSString stringWithString:].
* Updated OS X SDK to 10.7. Deployment target is still 10.5, although ideally
  it should bet 10.6 for 64-bit. (See also long comment in
  oolite-targets.xcconfig.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5139 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-28 14:26:00 +00:00
Jens Ayton
f1273d4d19 Load logging-related preferences before triggering logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5138 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-27 20:45:16 +00:00
Jens Ayton
74309e7766 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5137 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-27 20:36:35 +00:00
Jens Ayton
b9d4225490 Logcontrol.plists can now be used in OXPs, with restrictions. Logcontrol.plist entries affect debug console display of log messages. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5136 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-27 20:17:20 +00:00
Chris Morris
1e8c28aef3 Remove stray semicolon 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5135 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-27 15:19:44 +00:00
Chris Morris
66cb3ffc84 Fix compiler warning 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5134 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-27 06:34:47 +00:00
Chris Morris
c907a2a7ec Allows the short range chart or long range chart to be specified as the background for a mission screen (background:"SHORT_RANGE_CHART" and background:"LONG_RANGE_CHART") 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5133 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-26 18:54:26 +00:00
Jens Ayton
6dc8108106 [Mac] Added app category metadata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5132 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-26 15:30:38 +00:00