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

4538 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Morris
5831f2fe24 Retain carrier containing player to prevent possible early release. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5389 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 21:17:37 +00:00
Chris Morris
65399f471d Unify NPC and player combat laser cycle times to the player spec 
(weapon_reload_time left as separate variable for now, for easy reversion if this doesn't work out)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5388 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 19:09:53 +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
Chris Morris
3c5898edf8 Fix exhaust entity display oddity 
Fix failure to come off red alert when energy recovers


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5385 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 14:40:42 +00:00
Jens Ayton
a43b8b0b98 Fix for particle drawing artefacts (http://www.aegidian.org/bb/viewtopic.php?f=3&t=12597). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5384 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 13:34:35 +00:00
Chris Morris
66083d18be Fix bugs in display of missile lock status and in visual effect shader parameters. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5383 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-30 09:19:58 +00:00
Chris Morris
2d3d75a91c Compatibility between legacy script and special backgrounds 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5382 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 15:48:08 +00:00
Jens Ayton
de2486a0cb Comment typos and missing assertions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5381 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 12:11:34 +00:00
Jens Ayton
86ffd635c7 Use fewer octrees with very low resolution, which were causing oddities with Griff ships' detail subentities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5380 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:56:29 +00:00
Jens Ayton
a3e6bfd92b Fixed invalid use of reserved identifiers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5379 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:55:50 +00:00
Jens Ayton
15db8a0c3d Fixed a bug where Geometry only considered positive coordinates when determining octree bounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5378 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 11:41:25 +00:00
Chris Morris
a4b9803430 Fix bug in contract summary display, adjust tab stops 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5377 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-29 10:02:07 +00:00
Chris Morris
667bc9e683 Adjust sending of target lost messages on missile re-targeting to be in line with 1.76 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5376 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 17:34:49 +00:00
Chris Morris
3a79944c9a Adjust HUD drawing for better compatibility with 1.76 HUD behaviour 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5375 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 16:58:05 +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
2391a5f726 Cheap (nearly free) and optimal structural simplification of octrees. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5372 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 11:14:01 +00:00
Jens Ayton
38501e3499 Yet faster geometry by putting guts in a struct and using the stack instead of all those objects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5371 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-28 08:50:47 +00:00
Chris Morris
f749731f95 Reduce NPC mining laser firing rate to match player's. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5370 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 17:27:53 +00:00
Chris Morris
2b2b3afe52 Try re-enabling planet culling. Seems stable enough in tests. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5369 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-27 17:26:10 +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
f994150b93 Disabled Geometry allocation pool in GNUstep builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5367 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-26 19:21:39 +00:00
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