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

524 Commits

Author SHA1 Message Date
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
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
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
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