Commit Graph

581 Commits (master)

Author SHA1 Message Date
Jens Ayton 07398c6e2b Moved Mac-specific parts of DebugOXP into Mac-specific/.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5665 127b21dd-08f5-0310-b4b7-95ae10353056
2013-04-07 14:01:18 +00:00
Jens Ayton 1b6a19ba4f Deleted extremely obsolete, pre-1.65 era MorayMED textures.
All other textures of this vintage are long gone.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5664 127b21dd-08f5-0310-b4b7-95ae10353056
2013-04-07 11:28:21 +00:00
Jens Ayton 33be8e28dd [Xcode 4.6] Minor warning cleanup and project tweaks.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5630 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-29 20:13:37 +00:00
Jens Ayton 6632d67062 Xcode compatibility for r5604.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5605 127b21dd-08f5-0310-b4b7-95ae10353056
2013-01-05 17:03:56 +00:00
Jens Ayton 07b05f6839 [Mac] Fixed some state management problems in legacy full screen controller.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5530 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-24 15:50:50 +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
Jens Ayton 630b8a4752 Removed obsolete textures.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5526 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-23 10:33:36 +00:00
Eric Walch acdc8c6553 Added exhaust blur to mac build
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5524 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-22 22:51:30 +00:00
Eric Walch 9343330ce5 Added laser blur textures to the mac build
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5520 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-21 21:35:38 +00:00
Jens Ayton 69ac764b14 Added oolite-conditions.js to Xcode project.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5518 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-19 12:22:45 +00:00
Jens Ayton 4af0634b5e Updated Xcode project with new star textures.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5508 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-17 12:14:39 +00:00
Jens Ayton 25fa5730db Added missing world scripts to Xcode project.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5468 127b21dd-08f5-0310-b4b7-95ae10353056
2012-11-02 11:11:11 +00:00
Jens Ayton 52e1bbdbb8 OpenGL state management reform.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5453 127b21dd-08f5-0310-b4b7-95ae10353056
2012-10-28 18:11:01 +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
Jens Ayton 89f9f30403 Sped up Geometry some more by throwing yet more stack space at the problem (still less than 32 KiB). I think I'm done now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5374 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-28 15:30:26 +00:00
Jens Ayton 88c72eca43 Placate gcc, which apparently can't understand its own attributes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5373 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-28 13:01:55 +00:00
Jens Ayton 1475b6dce6 Octrees are now generated directly by Geometry processing instead of using an intermediate plist representation. Unnecessary copies of octree data eliminated.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5363 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-25 20:06:37 +00:00
Jens Ayton 7491a2b6d4 Xcode 4.5 project updates.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5349 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-22 12:18:22 +00:00
Jens Ayton e9f2de798b [Mac] Updated libpng, libogg and libvorbis. Clean rebuilds may be required.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5338 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-21 10:07:51 +00:00
Jens Ayton 1a576b24b3 Mac project updates for Interfaces.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5328 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-14 20:50:43 +00:00
Jens Ayton 548df2800a Support fire_rate shipdata key in verifier.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5313 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-10 00:21:29 +00:00
Jens Ayton e19364dc57 Mapped Unicode HAIR SPACE to 031.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5309 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-09 10:13:19 +00:00
Jens Ayton fa2cf4c9f5 Added oolite-default-effect-script.js to Xcode project. Removed copy-and-pasted comment about legacy script actions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5303 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-08 18:46:54 +00:00
Jens Ayton b1a3df4657 Cleanup of tests/ and tools/.
The following particularly unhelpful-looking things were moved to attic/:
 - tools/blurmapgen (tool to generate oolite-particle-blur.png)
 - tools/play-oolite-inflight.applescript (out-of-date template for
   OOMusicController AppleScript generator)
 - tools/plist2Script (tool to convert deprecated plist scripts to obsolete
   oos scripts)
 - tools/randomVectorIllustration (Tool to generate
   http://wiki.alioth.net/index.php/File:Randomvectordistribution.png)
 - tools/ScriptConverter (incomplete tool to convert deprecated plist scripts
   to an old dialect of JS scripts)
 - tools/simpleDebugConsole (C command-line implementation of debug console
   protocol, potentially useful for reference but not actual use)

The following OXP starting points were moved into tools/oxp-templates:
 - tests/encodings
 - tools/translation overrides

The following feature testing OXPs were moved into tests/test-oxps:
 - tests/AI overflow test
 - tests/JSInterfaceTests
 - tests/materialTestSuite
 - tests/PNGTestSuite
 - tests/RetroMissions
 - tests/shaderFallbackTest

The following redundant test was deleted:
 - tests/multiTexture (functionality subsumed by materialTestSuite)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5296 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-07 19:30:28 +00:00
Jens Ayton d157ce4a67 [Mac] Scale lines and points appropriately in HiDPI modes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5286 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-02 18:55:42 +00:00
Jens Ayton 2552a0df58 Turned off OO_LOCALIZATION_TOOLS in Mac deployment builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5280 127b21dd-08f5-0310-b4b7-95ae10353056
2012-09-02 10:22:28 +00:00
Jens Ayton d217eee59d Eliminated OOInteger and OOUInteger.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5273 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-29 17:28:01 +00:00
Jens Ayton 97a14b7630 Undid an accidental nonsense edit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5248 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-25 19:51:51 +00:00
Jens Ayton 1adf94353d Converted OOIsNumberLiteral ad-hoc test to unit tests.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5247 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-25 19:41:11 +00:00
Jens Ayton 156541e543 Updated Mac build-clean script.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5245 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-25 16:28:12 +00:00
Jens Ayton 508e4ae9b4 Removed my half-baked OOLight and OOCamera classes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5233 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-24 17:49:30 +00:00
Jens Ayton b02b53afe1 Removed aegidian's incomplete OOBrain/OOInstinct AI redesign project.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5232 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-24 17:41:53 +00:00
Jens Ayton cb827ccce0 [Mac] Added support for Lion system-standard full screen mode.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5224 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-24 13:10:46 +00:00
Jens Ayton 1fe597a7f9 Xcode update for visual effect entities.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5213 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-19 18:34:06 +00:00
Jens Ayton 0e617730dd [Mac] Changing resolution in 32-bit full screen mode works again.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5211 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-19 16:24:02 +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 e638ea259b Removed vestiges of Groolite; Growl and Notification Center notifications appear above the game anyway in 64-bit now, and fixing Groolite for 32-bit ain't gonna happen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5206 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:47:46 +00:00
Jens Ayton 52ad424bf8 Reorganized handling of mouse cursor visibility, adding GameController
property mouseInteractionMode which also reflects the distinction between
flight mode with mouse control on and flight mode with mouse control off.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5205 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 16:09:15 +00:00
Jens Ayton d27c045cbb [Mac] Basic mouse control in 64-bit fullscreen.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5200 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-18 13:43:58 +00:00
Jens Ayton f924b7786f [Mac] Fixed F12 key.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5193 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-17 19:55:21 +00:00
Jens Ayton a0b554ec40 [Mac] Initial "Snow Leopard mode" full-screen support for 64-bit.
Possible SDL breakage related to moving some display setting macros from
GameController.h to OOFullScreenController.h.

Features:
* Can access menu bar and dock in full-screen mode.
* Can command-tab out, use Spaces/Mission Control, etc. (Full-screen window
  hides when not frontmost application, except in Debug builds.)
* Can show JavaScript console, inspectors, help window etc. over game in
  full-screen mode.
* On multi-monitor systems, full screen mode will use the screen containing
  the largest portion of the non-full-screen window.
* Can control computer after breaking into debugger in full-screen mode
  without resorting to SSH.

Missing:
* Mouse control; hiding and capturing mouse during flight.
* Response to display reconfiguration.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5192 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-17 19:36:33 +00:00
Jens Ayton 50e44e796c Missing project file updates.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5189 127b21dd-08f5-0310-b4b7-95ae10353056
2012-08-15 07:08:02 +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 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
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
Jens Ayton ee0dbc2afd * Ship damage is reported to scripts with event shipTakingDamage(amount,
fromEntity, damageType). This is sent after decrementing energy and before
  responding to death, so it can be used to resurrect if ship.energy <= 0.
  Damage may be zero (for player with intact shields). (Feature request #5077)
* Player now correctly uses damage type "cascade weapon" instead of "energy
  damage" when appropriate.
* Player now cascades when hit by a q-mine.
* Player now reports shipEnergyIsLow as appropriate when taking scrape damage.
* Dead ships once again have status STATUS_DEAD during shipDied()/
  shipKilledOther() message pairs.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4235 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-05 13:42:36 +00:00
Jens Ayton b6b00ab89a Cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4223 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-04 12:53:25 +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