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

537 Commits

Author SHA1 Message Date
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
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
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
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
5cafda59d9 Implemented OOWeakSet - like NSMutableSet, but uses weakrefs and cleans them up as needed. 
Use OOWeakSet for _shipsOnHold in StationEntity.

This implementation is pretty naive. I have a "better" version, only it consistently crashes a lot.

Also, integrated unit tests (when building with Xcode 4). Tests are run at the end of TestRelease and Deployment builds, and can be run manually with Product -> Test.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5109 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-19 17:42:24 +00:00
Jens Ayton
6a4a3a43ac Typos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5069 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-11 17:15:41 +00:00
Jens Ayton
6ba3d633ea Fixed a sign mismatch issue. [Mac] Build system update for r5064. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5065 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-11 12:43:28 +00:00
Jens Ayton
ddd85e5e95 [Mac] Build system update for r5058. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5059 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-07-10 19:38:21 +00:00
Jens Ayton
4b6a56698f Added more instrumentation of texture cache issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5041 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-06-29 09:39:35 +00:00
Jens Ayton
b7ccf80512 [Mac] Updated game icon and splash screen for retina displays. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5015 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-06-16 17:51:05 +00:00
Jens Ayton
899d9e42b6 Gave myself top billing. (But no I want to implement kerning.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5010 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-06-15 21:49:04 +00:00
Eric Walch
fc5bd583bc - Station related ships (like miners, patrols etc.) now inherit the stations heat insulation if that was higher. 
- Frame Callbacks now transfer the correct time difference when timeAccelerationFactor is active.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4919 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-10 15:28:16 +00:00
Jens Ayton
60f04a0867 Tweaked some Xcode file attributes and added terminal line breaks to make Unix tools happy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4906 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 10:18:58 +00:00
Eric Walch
4500f5fa79 - Fixed a typo for the Mac compiler and added the 2 new AIs to the mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4901 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-02 21:28:08 +00:00
Jens Ayton
3b186ddbad Fixed a sign error, and cleaned up cargo capacity logic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4869 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 17:14:59 +00:00
Eric Walch
01a3b5c29b added cim's new missile script also to mac builds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4863 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-20 07:32:19 +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
Eric Walch
2c2e3b416a - the restored planet shader files from r4818 now also work on mac builds 
- escorts launching from stations, now correctly have their mothers scanClass

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4825 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-01 09:59:08 +00:00
Jens Ayton
a106f4055f Shader synthesizer: light maps can now be controlled by bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4793 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-26 17:08:49 +00:00
Jens Ayton
95b6e5f175 Fixed stringification of null and undefined log message classes in JS logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4788 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-21 20:43:57 +00:00
Jens Ayton
d623cef04d [Mac] Fixes for Xcode 4.3 compatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4786 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-17 00:00:39 +00:00
Jens Ayton
73cd4d321a Work on shader synthesizer integration. Doesn't work properly yet. Controlled by USE_NEW_SHADER_SYNTHESIZER macro (currently off). When on, adds new secret preference: dump-synthesized-shaders (boolean, default false; writes synthesized shaders and material plists to logs directory, no effect in deployment builds). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4763 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-06 23:01:06 +00:00
Jens Ayton
9bbc0e8176 [Mac] Fewer nib/xib-related warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4759 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-03 22:33:03 +00:00
Jens Ayton
4365c0c9ad Removed some obsolete optimization flags. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4758 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-03 09:36:03 +00:00
Jens Ayton
68a9515e24 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4753 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-29 22:36:29 +00:00
Jens Ayton
d5d10f44f3 Reenabled heavy GL checking in Mac debug builds, I think that got lost in the project upgrade. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4745 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-20 23:03:48 +00:00
Jens Ayton
bc7369e1a8 Cosmetic changes to project settings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4722 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:38:30 +00:00
Jens Ayton
c8d7e46a44 Removed a bunch of PowerPC arithmetic stuff that probably wasn't helping much anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4719 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:08 +00:00
Jens Ayton
5921ace94f Repeated a bunch of configuration changes for Xcode 4 that somehow got lost in a git rebase. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4714 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:17 +00:00
Jens Ayton
d15e4988ad Added Xcode 4 schemes for Oolite's three configurations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4713 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:04 +00:00
Jens Ayton
86e3077e96 Merged Leopard support bundle into game. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4709 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:31 +00:00
Jens Ayton
b3e2d8ccd0 Mac build setting changes and code compatibility fixes: 
SDK is now 10.6.
Deployment target is now 10.5.
PowerPC support disabled.
Compatibility wrappers added to NSFileManager.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4705 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:13:56 +00:00
Jens Ayton
af3e049cbc Fixes to build with Xcode 3.2.6 under Mac OS X 10.7. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4584 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-21 12:30:48 +00:00
Jens Ayton
fa23e7bc11 Set max_missiles to 4 for NPC cobra3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4454 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 20:53:53 +00:00
Jens Ayton
67dd32dc17 [Mac] Removed custom configuration for libpng; too much bother for a 133 KiB saving. Fixes bug #17968. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4451 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 17:27:18 +00:00
Jens Ayton
f15a119569 Mac build now uses PDF version of Read Me. RTFD version is gone. (Incidentally, has anyone noticed that the font size in the PDF is insanely, illegibly small? I suspect people want to be able to read it without printing it on A3 paper.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4444 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 16:14:54 +00:00
Jens Ayton
1e08cd022f Use recommended keys for fallback material. Removed some new-planets stuff that isn't used. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4363 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 16:44:29 +00:00
Jens Ayton
c6ed8d2694 Lasers now end at their impact point. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4343 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-13 11:39:25 +00:00
Jens Ayton
86707d5cd7 Sorted some JS property/method declarations for easier comparison with docs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4340 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 19:34:41 +00:00
Jens Ayton
c39d9f285f JS audit: OOJSPlayer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4303 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 17:24:11 +00:00
Jens Ayton
27bac3ca61 JS audit: OOJSShip. Moved addPassenger() and awardContract() to PlayerShip where they belong. Also made them not print warnings when conditions aren't fulfilled, because returning an error flag _and_ logging a warning is an unhelpful combination. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4292 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 01:13:21 +00:00
Jens Ayton
435c218d6e JS audit: OOJSEntity. Also cleaned up some redundant [entity isPlanet] && ![entity isSun] checks - -[OOSunEntity isPlanet] is false. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4289 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-10 23:47:42 +00:00
Jens Ayton
1cf9e115fb [credits_number] no longer localized for legacy scripts, as it might be used for arithmetic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4286 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-10 21:10:34 +00:00
Jens Ayton
c33a8fbc73 Updated icon and related files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4275 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-09 18:57:34 +00:00
Jens Ayton
d1db0f0f64 JS formatInteger() now punts on *very* large values correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4273 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 22:45:30 +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
b0eb0f1676 * OOParticleSystem now uses the "new" particle blur texture for better 
blending. blur256.png is no longer used for anything.
* The particle effect textures are now preloaded to avoid stutter.
* The sound preloader is now actually invoked. (This appears to have been an
  oversight; I couldn't find a reference to it being deliberately disabled.)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4248 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-06 09:23:16 +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