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

4566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
bf1fb6f08e Fix for rainbow dust. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5366 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 21:21:26 +00:00
Jens Ayton
841c118230 Fixed a comment to reflect actual interface. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5365 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 20:33:37 +00:00
Chris Morris
ff4bcf88d2 Take out frustum culling of planet while the reason this causes instability is figured out. -DRAINBOW_DUST_INVESTIGATION re-enables. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5364 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-25 20:22:21 +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
652c32a915 Further minor Geometry tweaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5362 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-24 20:33:17 +00:00
Jens Ayton
41d796540a Removed some innacuracies in Geometry performance notes. Fortunately this brain fart didn't affect the actual outcome. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5361 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 22:34:36 +00:00
Marc
bc40d48947 - rev5353 redux: go faster sauce poured on GNUStep builds too... here goes nothing! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5360 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 20:28:50 +00:00
Marc
53b1c1407d * OXP related compass behaviour update: 
- if compass is not visible, compass mode changes are disabled.
- compassTargetChanged now fires when compass display switches from visible to invisible during in-system flight - target is null, signifying the compass is being turned off.
- compassTargetChanged now fires also after willEnterWitchspace, with target undefined, meaning the compass lost its target.
- compassTargetChanged should now fire after a witchjump to a new system, under all circumstances.

* escape_pod_role property added to shipdata, to be used in preference to escape_pod_model
- yet some more, mostly whitespaces, cleanup...


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5359 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 16:27:37 +00:00
Jens Ayton
97b2ee5e27 Additional tweaks to Geometry. Bonus: typo fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5356 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 13:19:19 +00:00
Eric Walch
2aa4e75178 Fixed C&P bug #18737 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5355 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-23 09:43:07 +00:00
Jens Ayton
b921850072 Cleaned up a bit after previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5354 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 19:48:27 +00:00
Jens Ayton
abded89d8d Poured go-faster source on Geometry. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5353 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 17:57:19 +00:00
Jens Ayton
b2f7b3fdf9 Removed write-only normal from Triangle struct. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5352 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 15:09:41 +00:00
Jens Ayton
38b0ad95ad Clean up intermediate Geometry objects immediately after creating octrees. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5351 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 14:20:20 +00:00
Jens Ayton
d37d178a3a Isolated uses of Geometry class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5350 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-22 12:41:13 +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
27e3afbb37 Gave OOSunEntity nova-tracking variables sensible names. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5348 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 17:41:33 +00:00
Jens Ayton
d4dc32eb2d Velocity integration is now a non-optional part of -[Entity update:]. Side effect: NPC-launched Q-mines now drift as intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5347 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 17:11:37 +00:00
Jens Ayton
dee8dd906e Fixed up AI to forward-declare new private methods without exposing them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5346 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 17:08:40 +00:00
Chris Morris
478698a2da Fix compiler warning in AI 
Fix interstellar bug in parcel contracts (Berlios #18735)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5345 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 16:56:06 +00:00
Jens Ayton
ef1b5646ef Entity->velocity is now used only to store actual velocities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5344 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 16:25:14 +00:00
Jens Ayton
50c47d4926 OOParticleSystems now move in accordance with originator's velocity as intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5343 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 16:03:39 +00:00
Jens Ayton
da76eabdcc Changed OOBreakPattern to use velocity normally instead of custom scaling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5342 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 15:52:15 +00:00
Jens Ayton
7267edc17c Changed pickled AI states from NSDictionary to custom class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5341 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 13:17:27 +00:00
Jens Ayton
5e586db22e Whitespace cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5340 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-21 11:42:18 +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
Chris Morris
11ccc371ae Fix likely cause of exception-based crash 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5337 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-20 17:24:00 +00:00
Nikos Barkas
e43043ac02 Fixed bug where activating the escape pod would result in game over. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5336 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-20 12:52:43 +00:00
Jens Ayton
70137b0adf Fixed a truncation warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5335 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-19 20:03:01 +00:00
Chris Morris
cc769b14b6 Make background for parcel delivery maps come from screenbackgrounds.plist 
Add some more (unused in core) entries to screenbackgrounds.plist so that OXPs can define slightly different backgrounds for F6 screens and their missionscreen alternates. 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5334 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-17 17:53:08 +00:00
Marc
37b835e084 fixed graphic glitches with sound and gamma(SDL) sliders in game options screen 
quick'n'dirty mac compiler fix.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5333 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-17 09:21:54 +00:00
Marc
2032688291 5331 part 2! Corrected a logic mistake from rev5331 and removed some coomented ou code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5332 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-16 23:20:01 +00:00
Marc
5e11ee5103 * Mass lock/hud internals refactoring part II - boosted various hud elements rendering speed, & hopefully didn't break xcode4 builds - there's more to come... 
* disabled the obsolete & unclear AEGIS_CLOSE_TO_PLANET AI message (AEGIS_CLOSE_TO_MAIN_PLANET & CLOSE_TO_PLANET are sent for main & extra planets respectively)
* fixed Aegis status edge case - events & messages should now also fire correctly when moving directly from one oxp planet vicinity to another, plus somewhat streamlined the algorithm.
- assorted minor cleanup: code, comments & blank spaces

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5331 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-16 21:16:25 +00:00
Jens Ayton
7ee42fcbf5 Tagged some more performance bottlenecks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5330 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-15 21:44:41 +00:00
Chris Morris
40c975ffcb Fix potential crash with interfaces. 
Remove "far too late" parcel contracts from the list.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5329 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-15 20:18:56 +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
Chris Morris
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens. 
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 19:49:53 +00:00
Jens Ayton
320de0d9e6 Minor fixes and workarounds for Clang static analyzer issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5326 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 16:16:50 +00:00
Jens Ayton
63de7edcc6 Missing logcontrol entry for r5324. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5325 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 00:11:36 +00:00
Jens Ayton
8bfbb37da2 Async NSSpeechSynthesizer setup on 64-bit Macs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5324 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 22:26:12 +00:00
Jens Ayton
8c4a8dfeda Faster, O(n) implementation of -[ShipEntity findNearestPlanet]. 
This method is called every frame for every ship through checkForAegis. The previous implementation was taking about 9% of -[Universe update] time in a vanilla Lave; rewrite takes < 1% and scales better.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5323 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 22:13:15 +00:00
Jens Ayton
97d909d8ed Fixed an integer precision mismatch and updated comment on performance in HeadUpDisplay. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5322 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 21:57:36 +00:00
Jens Ayton
81fc10caf0 Removed some more commented-out code from dock refactoring. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5321 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 21:55:15 +00:00
Marc
e878d62401 - New feature: contracts that might still be completed, but are now past the estimated departure time, are shown in orange for a while. New translation string added. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5320 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 15:54:31 +00:00
Marc
37bd9b1923 Mass lock refactoring, part I: 
- extracted mass lock calculations from inside drawScanner, seems to be mass locked properly with or without the main scanner being displayed, relevant code still in HeadUpDisplay.m
- assorted code cleanup in preparation of transferring the relevant code to PlayerEntity.m

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5319 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 14:32:20 +00:00
Marc
a0bfaa6f78 Contracts screen fixes: 
- long descriptions for passenger and cargo contracts are now updated in real time. ( see http://www.aegidian.org/bb/viewtopic.php?p=173363 )
- if a contract's estimated departure time is in the past, that contract won't be selectable anymore.
- non-ton items: on-board space requirements should now be accurate within 1 gram for gemstones, 1 kg for gold and platinum.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5318 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-13 04:10:45 +00:00
Nikos Barkas
8ce944d4df Need for space. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5317 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-11 13:56:58 +00:00
Jens Ayton
85daf93020 Fixed syntax errors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5316 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-11 09:24:59 +00:00
Nikos Barkas
c3943cc1a4 Slightly better gameoptions grouping. Docking Clearance is now below Autosave, no additional spacer needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5315 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-11 07:00:11 +00:00