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

3985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
331c2bdcad Fixed missing log message classes in shader synthesizer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4766 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-08 00:37:07 +00:00
Jens Ayton
dce3f842ce Fixed normal and parallax mapping with shader synthesizer. Player Cobra 3 is temporarily pink while using synthesizer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4765 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-08 00:34:07 +00:00
Jens Ayton
c27811e690 Shader synthesizer now supports diffuse lighting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4764 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-07 23:03:31 +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
69a60a0248 Initial work on integrating shader synthesizer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4762 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-04 14:40:19 +00:00
Jens Ayton
4634c0962c Copied in shader synthesizer from Oolite2 fork (not yet used). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4761 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-04 14:39:52 +00:00
Jens Ayton
10a3f516b3 [Mac] Removed passive support for Smart Crash Reports. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4760 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-03 22:36:26 +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
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
17a9500c4a Minor fixes and project upgrade for fonttexgen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4756 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-31 19:24:56 +00:00
Jens Ayton
5377668ea8 Restored energy bomb compensation and made energy bomb strict mode only again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4755 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-31 19:17:45 +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
Eric Walch
9bf1f54f00 - Don't disgorge and revive dead ships from wormholes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4751 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-26 16:30:31 +00:00
Eric Walch
474ad5c990 Fixed a problem with the shipyard screen when a ship with chance=1 defined none-installed optional equipment. (e.g. equipment from an other oxp that was currently not installed). 
When there are no problems this fix will be ported to 1.76 maintenance.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4750 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-23 21:48:14 +00:00
Jens Ayton
059c2ceede Changed more ScanVectorFromString()s to oo_vectorForKey:s. (N.b.: fully backwards compatible.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4749 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-21 19:05:12 +00:00
Jens Ayton
bb41b5f075 Made reading of aft_eject_position type safe. As a side effect, it now accepts array-of-number notation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4748 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-21 18:01:18 +00:00
Jens Ayton
a948324616 Fix to previous fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4747 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-20 23:44:11 +00:00
Jens Ayton
149d2067f4 Attempted workaround for breakage in r4738 - see http://www.aegidian.org/bb/viewtopic.php?p=162601#p162601 . Untested. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4746 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-20 23:10:02 +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
Eric Walch
fd073849fe - Ships that have a specific commodity defined as cargo, no longer get their bounty reduced to 10% when the pilot ejects. 
- The scoop icon now correctly shows a full cargo hold when special cargo is transported.
- Added code that points the ships towards the station during stationkeeping. Main reason is that the player has something to watch when waiting.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4744 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-18 21:41:37 +00:00
Marc
3d0f56443a * fix: the. shipFiredMissile event now fires for all missiles with a valid target, regardless of scanClass. 
* added .shipReleasedEquipment event for all bombs/external equipment launched.

- corrected wrong faceArea calculation inside OOMesh.
- removed unused/experimental alternative shield recharge behaviours.
- Made it slightly easier for escape pods to land. Catch them while you can! :)
- rate of refuelling now dependent on ship's general state of repair. As a side effect, this also increases the refuelling price depending on state of repair, an alternative would be to decrease the max ly jump radius, while leaving the price for a full tank unmodified by repair status. Will put the question to the forum!

Plus the inevitable 'assorted code & comments cleanup'.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4742 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-18 19:55:33 +00:00
Jens Ayton
deb8b846be Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4741 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-18 15:23:11 +00:00
Jens Ayton
121f6ef237 Slightly simplified default fragment shader now that we don't need to worry about Mac OS X 10.4 compatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4739 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-16 18:53:56 +00:00
Jens Ayton
edcf04fb95 Upped SDL GL requirements to 24-bit colour and 32-bit depth as a possible workaround for Intel HD 3000 issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4738 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-15 10:34:43 +00:00
Eric Walch
e5a6411d1a - using the js method 'launchPlayer()' during one of the two docking handlers has no longer any undesirable side effect. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4737 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-11 19:43:16 +00:00
Jens Ayton
b4098195cb Fixed typo blocking GNUstep builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4736 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-09 10:25:37 +00:00
Jens Ayton
36c5304df8 Removed OOFastArithmetic.m from GNUmakefile. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4735 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-09 09:46:18 +00:00
Jens Ayton
21a9192a3d Build breakage fixes: 
* Removed declarations for now-removed "fast" maths functions
* Corrected definition of OOLITE_HAVE_PROTOCOL_OPTIONAL to exclude gcc on non-Mac systems


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4734 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-09 09:16:58 +00:00
Jens Ayton
fe5ac693dd Various minor issues exposed by Clang static analyzer, and associated cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4733 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 22:49:10 +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
566d168073 Fixed leak of ships ejected using script methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4731 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:55:41 +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
70d3dc8b3c Fixed logic error in OOPriorityQueue memory management which could potentially cause a crash when removing JS timers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4729 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:25:46 +00:00
Jens Ayton
ff3715eebf Fixed memory leak when writing cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4728 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:23:45 +00:00
Jens Ayton
4da2f456ac Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4727 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:15:57 +00:00
Jens Ayton
30d5b3556a Fixed a nominal potential crasher. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4726 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:08:20 +00:00
Jens Ayton
8a409a2bf6 Eliminated a write-only variable and a pointless read in -broadcastDistressMessage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4725 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:07:29 +00:00
Jens Ayton
aa80fbaa4f Slightly simplified auto-dock logic and eliminated a write-only variable that was bothering the static analyzer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4724 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 21:01:20 +00:00
Jens Ayton
98fcd4b813 Removed a redundant and unidiomatic retain/release pair. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4723 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 20:46:17 +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
418953b4a0 Eliminated OOInvSqrtf and OOFastInvSqrtf (which wasn't faster), and various - mostly unused - fast_foo functions that depended on OOFastInvSqrtf being fast. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4721 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:16:26 +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
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
ad453480d5 Removed some duplicated methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4718 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:59 +00:00
Jens Ayton
25264f5796 Fixed widespread confusion between OOCargoType and OOCommodityType. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4716 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:39 +00:00
Jens Ayton
d4856bf895 Fixed various problems caused by Clang's stricter type checking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4715 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-08 18:15:28 +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
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