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

557 Commits

Author SHA1 Message Date
Jens Ayton
6df270e3b1 Run mkmanifest.sh in Xcode builds 
Also:
* Moved it into tools/
* Changed \ts to literal tabs
 2013-11-08 19:09:57 +01: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
Jens Ayton
4d30fbbf5f Clean up Xcode project settings 2013-11-06 18:49:24 +01:00
Jens Ayton
50ec08dfb6 [Mac] Use scripts to copy resources 
...instead of needing to update Xcode project each time.

These scripts are pickier than what's currently used on GNUstep
systems, mostly to keep out .DS_Store and similar.
 2013-11-05 16:38:28 +01:00
Jens Ayton
1547fa5ea8 Remove unused class OOALConcreteSound 2013-11-05 14:49:00 +01:00
Jens Ayton
086e8ea724 Merge branch 'master' into zipped-oxp-support 
Conflicts:
	Oolite.xcodeproj/project.pbxproj
 2013-11-05 13:33:16 +01:00
Jens Ayton
cd091fb247 [Mac] Replace obsolete POSIX functions 
bcopy() and bzero() were obsoleted in POSIX 1.2001 and removed in
POSIX 1.2008.

Also set _POSIX_C_SOURCE=200809L macro so we don't accidentally
use them again.
 2013-11-05 13:30:37 +01:00
Jens Ayton
5b97b33024 [Mac] Add role-categories.plist to Xcode project 2013-11-02 20:10:47 +01:00
Jens Ayton
9579dcfb6a Use OpenAL in Mac builds 2013-11-02 19:35:22 +01:00
Jens Ayton
ed55d08251 Merge remote branch 'origin/master' into zipped-oxp-support 2013-11-02 14:44:16 +01:00
Jens Ayton
d66798f670 Fix more Xcode 5 project issues 
I thought I'd done these, but apparently not.
 2013-11-02 14:27:09 +01:00
Jens Ayton
c58062947c Add missing resources to Xcode project 2013-11-02 14:26:16 +01:00
Jens Ayton
4ea7a8078d Add zip support files to Xcode project 2013-11-02 13:23:24 +01:00
Jens Ayton
5f6c85a0d7 Embed debug plug-in in application instead of Debug.oxp 2013-10-13 15:19:48 +02:00
Jens Ayton
c3817c4f92 Add various missing resources to Xcode project 
* oolite-particle-cloud.png and oolite-particle-cloud2.png
* oolite-priorityai.js
* Various JS AI scripts
 2013-10-13 15:05:16 +02:00
Jens Ayton
b6072ea38d Add waypoints to Xcode project 2013-10-13 14:05:34 +02:00
Jens Ayton
7a5c16c500 Fix Xcode 5 issues 2013-09-29 18:05:38 +02:00
Jens Ayton
f247f519f6 Add OOExplosionCloudEntity to Xcode project 2013-09-29 13:55:28 +02:00
Jens Ayton
808f8ebffc [Mac] Add registration script to Xcode project 
Also set up project so registration and populator scripts are actually copied
to the right place.
 2013-08-26 08:00:33 +02:00
Jens Ayton
a16231bbd0 [Mac] Add populator script to Xcode project 2013-08-25 13:57:11 +02:00
Jens Ayton
f7a664f18c Add OOHPVector and OOJSPopulatorDefinition to Xcode project 2013-07-15 20:56:07 +02:00
Jens Ayton
e4b48f43e4 Moar warnings (and fixes for same) 2013-07-06 23:38:39 +02:00
Jens Ayton
598415a23c Add OOWormholeEntity to Xcode project 2013-06-30 12:01:57 +02:00
Jens Ayton
aeebd2304c [Mac] Fix unit tests 2013-06-12 00:56:47 +02:00
Jens Ayton
61e4b1682f Remove support for Mac OS X 10.5 and 32-bit Macs 
- Bump deployment target to 10.6
- Bump SDK to 10.8
- Remove i386 architecture
- Remove legacy full screen controller
- Remove OOLITE_MAC_OS_X_10_6 macro (would always be 1)
- Update xibs
- Bump Mac-specific submodule for equivalent changes
 2013-06-11 23:48:26 +02:00
Jens Ayton
52dff6239c Update Mac build system for git layout and Xcode 4.6.2 2013-05-11 21:33:02 +02:00
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