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

74 Commits

Author SHA1 Message Date
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
AnotherCommander
fade2ff2ad Windows dependencies update to correct revision reference on oolite master. 2013-10-31 10:38:31 +01:00
AnotherCommander
79aa542728 Update Windows dependencies step 2: Renaming Windows-x86-deps to Windows-deps. 2013-10-31 09:21:59 +01:00
AnotherCommander
45b67a0d3b Update of Windows dependencies for x64 support step 1: Removal of old dependencies. 2013-10-31 09:06:57 +01:00
Jens Ayton
5ad46ca935 Merge remote branch 'origin/maintenance/1.77' 
52b6c2b Updated terrastorage network name to terrastorage.dyndns.info
9c35146 [Mac] Remove display.fullScreen.temp logging
58175cc Exclude windows build products (closes #53)
4db315d Update changelog
7138dcf Update .gitignore file
1ff3616 Fix shipEnergyBecameFull event to fire at times other than launching
1ea1cc1 Merge branch 'svn-integration' into maintenance/1.77
a7c0305 Reverted the oops of the previous commit and applied correct fix to sub...
8a73443 Re-applied rotation to subentities, which was taken away on r5639, Not...
98ef76b Fix regression in rotational_velocity key for subentities
8b339d4 Display correct pause key in paused message. (issue #41)
659b572 Expose keyconfig.plist contents to script in oolite.gameSettings.keyConfig
055c480 Fix scanner display bug introduced in 50895952

Conflicts:
	src/Core/Entities/PlayerEntity.m
 2013-09-10 09:29:30 +02:00
getafix@oolite.org
52b6c2b8ab Updated terrastorage network name to terrastorage.dyndns.info 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5695 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-09-07 18:34:50 +02:00
Jens Ayton
9d6af14f6f Fix SpiderMonkey Linux build 2013-05-13 22:14:03 +02:00
Jens Ayton
f3709fa842 Bump deps/mozilla for missing directory 2013-05-13 22:05:29 +02:00
Jens Ayton
1e3117655f Use submodules for Ogg and Vorbis (OS X) 2013-05-13 20:44:27 +02:00
Jens Ayton
1e86f3ef45 Make submodule references relative 2013-05-13 19:26:28 +02:00
Jens Ayton
c6e8a6acb6 Use submodule for SpiderMonkey (OS X/Linux) 2013-05-13 19:09:39 +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
dd53a44b82 Set up submodules 2013-05-11 21:32:45 +02: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
3e11441df4 [Mac] bumped libpng version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5368 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 13:34:30 +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
a917f3eb94 [Mac] Fixed libvorbis URL. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5339 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 11:18:54 +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
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
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
4cdf3812c2 Updated libpng to 1.5.8 for Mac OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4757 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-02 22:06:25 +00:00
Jens Ayton
11619ea6fa This time for real: avoid redundant builds of libjs under Xcode 4. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4732 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 22:32:37 +00:00
Jens Ayton
17ebd69552 Avoid redundant recompilation of 30 files in libjs in every Xcode 4 build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4730 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:49:04 +00:00
Jens Ayton
d0b7235ecf Eliminated arithmetic functions that existed only for (mostly dubious) PowerPC optimizations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4720 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:18 +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
16d7119c0a Switched compiler to Clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4712 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:56 +00:00
Jens Ayton
7bf2a10879 Configuration fixes to get libpng deployment release to build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4710 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:40 +00:00
Jens Ayton
95de278701 Removed PowerPC-specific hacks for SpiderMonkey. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4706 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:14:05 +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
797a3a73b6 Libpng version update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4513 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-12 18:12:48 +00:00
Jens Ayton
6a9435adaa Switched to Firefox 4.0 final version of Spidermonkey (unchanged from RC1, just a different URL). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4485 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-22 15:50:35 +00:00
Jens Ayton
f13537c2a1 Fixed 32-bit Mac debug builds of libpng. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4467 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 00:34:18 +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
7ec4ffbef7 Bumped SpiderMonkey to FF4rc1. No code changes needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4447 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 15:50:22 +00:00
Michael Werle
0ff18e7dd8 Convert download scripts to /bin/sh, as requested by 'Spooky' for better compatibility with FreeBSD (and other Unices). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4443 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-08 15:23:01 +00:00
Jens Ayton
71e7128d73 Updated to FF4b12 SpiderMonkey for Mac; code now requires this version due to an API change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4409 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-26 10:30:27 +00:00
Michael Werle
d915f5fde5 Makefiles - rework to accomodate new Javascript library 
(Combined effort from Micha, Konstantinos, and Nikos)
 + removed support for building legacy libjs
 + (Linux only) now use the MacOS update script to auto-download the JS library
     - download script failure checks tweaked for older versions of bash
 + new Makefiles:
     - libjs.make - to download & build libjs (Linux only)
     - config.make - contains shared configuration variables between makefiles
 + debian packaging rules updated to suit



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4362 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 13:24:56 +00:00
Jens Ayton
dc25ba0340 [Mac] Update to FireFox 4.0b11 Spidermonkey, in light of delay. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4350 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-13 20:01:21 +00:00
Jens Ayton
1fc94ba8b9 Reverted libpng. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4226 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-04 15:45:03 +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
436dfe5ebe [Mac] Fixed link error in TestRelease builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4174 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 13:31:46 +00:00
Jens Ayton
114a7b7d9f Player debris (and ejection doppelgänger) now inherit player temperature. (Bug #17391) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4173 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 13:07:01 +00:00
Jens Ayton
afd4e2c301 [Mac] Fixed overzealous download script fix redux. Also, disabled environment variable spew when building Ogg and Vorbis. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4172 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 12:40:00 +00:00
Jens Ayton
a278738d02 Fixed overzealous download script fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4171 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 12:26:05 +00:00
Jens Ayton
e59ffc2aff Switch to FireFox 4 beta 10 version of SpiderMonkey for Mac OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4170 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 11:55:19 +00:00
Jens Ayton
19f05aa8f2 Changed assertion on targeting a wormhole without a wormhole scanner to soft fallback behaviour, after a report in the forum. Possibly a recycled entity ID? Memo: entity IDs are evil. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4160 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-27 00:29:27 +00:00
Jens Ayton
1fabd05576 [Mac] jsautooplen.h and jsautokw.h are now actually automatically generated for ease of updating. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4159 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-26 17:49:05 +00:00
Jens Ayton
a749e59a43 Missing file. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4158 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-26 00:11:54 +00:00
Jens Ayton
f987fd0829 [Mac] Added Sparkle update support, finally. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4157 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-25 23:31:19 +00:00
Jens Ayton
40eb15a237 Going through Clang Static Analyzer messages. Some fixes, some cleanup. In particular, fixed leaks of planet texture generators. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4151 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-25 18:51:52 +00:00