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

4663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Morris
20b59c9a62 Use station name on F8 screen for non-main stations 
Fines only applied at main station


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5517 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 20:58:08 +00:00
Chris Morris
f599d0f5f1 Remove testing code which snuck into commit. 
Add condition script to a few items it was missed from.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5516 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 18:17:06 +00:00
Chris Morris
1e76b58bce Missed file from last commit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5515 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 16:37:31 +00:00
Chris Morris
d497aebc53 Equipment condition scripts now include context of award. 
NEU, cloak moved to use condition scripts rather than TL:99 hack
Base equipment now uses condition script to allow OXP writers to deny particular items at their own stations. (e.g. no fuel)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5514 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-18 16:33:41 +00:00
Chris Morris
2c70910cc5 Fix some beacon bugs 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5513 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 17:25:31 +00:00
Chris Morris
3e7cbc9118 Include gamma control and docking clearance options in the save game. Add (untested) no-ops for gamma control to Cocoa build to keep savegame keys consistent. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5511 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 13:54:41 +00:00
Chris Morris
f574fbc350 - align atmosphere rotation mostly to planetary rotation 
- reduce default planet rotation speed range to ~1-2 hours / revolution
- give CLASS_STATION the same protection as CLASS_THARGOID from accidental bounties


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5510 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 13:36:31 +00:00
Jens Ayton
3884ca13ef Supressed integer precision nits in old PlanetEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5509 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 12:18:05 +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
a4050d5218 Spelling fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5507 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 12:07:55 +00:00
Nikos Barkas
41267a8aeb Added ZygoUgo to contributors list. Minor clean up on startextures.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5506 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-17 10:20:42 +00:00
Chris Morris
cd9e1e062c Rescaling visual entities now once again rescales their flashers 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5505 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-16 21:35:21 +00:00
Nikos Barkas
e693c8f3ae With creator's permission, added ZygoUgo's new star textures in the core resources. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5504 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-16 16:31:50 +00:00
Chris Morris
4076837db4 Fixing the cloud generation bug makes planetary textures that already include clouds (or are entirely clouds...) look a bit strange. Add cloud_alpha property so that texture packs can tone them down. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5503 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-14 21:43:12 +00:00
Nikos Barkas
5cb844bb60 Minor cosmetic change in interfaces screen: capitalization on titles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5502 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-14 21:08:46 +00:00
Chris Morris
e1c5326e28 Add background/overlay to no-contract summary pages for interfaces. 
Add extra safety check to cargo contract generator.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5501 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-14 19:57:04 +00:00
Chris Morris
e91e9d688b Fix HUD-losing bug with interface scripts 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5500 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-14 18:48:30 +00:00
Chris Morris
8325d5a957 OPENGL_STATE_ADDITIVE_BLENDING normally has a depth test, so invert the sense of the sun painting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5499 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 22:46:22 +00:00
Chris Morris
1a542a3c4b Combine 1.77 bug fix sections in changelog, make spelling consistent. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5498 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 22:02:31 +00:00
Chris Morris
9fa11d841e Adjust dust for no-shader mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5497 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 20:58:30 +00:00
Chris Morris
a26b15ecdc Check for GL extensions needed for last commit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5496 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 20:18:42 +00:00
Chris Morris
eb3934d8f6 Switch dust from points to point sprites. Massive efficiency improvement on my graphics card. Will need testing to make sure it doesn't break things for others. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5495 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 19:09:01 +00:00
Nikos Barkas
938bcb59bb Added missing 1.76->1.76.1 changes part in Changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5494 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-13 12:39:04 +00:00
Chris Morris
9f24d71915 Fix doubled-comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5493 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 23:05:57 +00:00
Jens Ayton
716402e90c More commented-out stuff for cim to remember to clean up later. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5492 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 22:26:36 +00:00
Jens Ayton
250c307b05 Less verbose JS trace/profile output when built with clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5491 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 22:25:24 +00:00
Chris Morris
fa66877d65 Fix some more warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5490 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 22:10:45 +00:00
Chris Morris
bab2b93df5 Since star/nebula_count_multiplier can easily give systems with greater than SKY_"MAX"_STARS/BLOBS, rename those constants, and let (in full detail mode) an explicit sky_n_stars/blurs setting join the fun. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5489 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 21:57:50 +00:00
Chris Morris
c53b58cf38 Another couple of contracts functions 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5488 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 21:03:55 +00:00
Chris Morris
8c6f2e6dee Comment out GUI_SCREEN_CONTRACTS and related functions and variables 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5487 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 18:18:03 +00:00
Chris Morris
254d8771c4 subEntities property and restoreSubEntities method for visual effects 
Fix error in previous commit


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5486 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 15:56:17 +00:00
Chris Morris
b8761626c0 mission.exitScreen r/w property (only useful to set from callback) 
mission.screenID property (set from screenID property in runScreen)
Built-in interfaces set a screenID 
Update Changelog.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5485 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-12 15:01:07 +00:00
Chris Morris
ce5eae2096 Enable: 'b' secondary activation key for equipment (timer's patch) 
Disable: NEW_PLANETS (not going to be ready for 1.77; maybe next time)
Fix: scan class initialisation bug for demo ships
Fix: cloud initialisation bug for textured old planets
Add: frustum culling support for old planets
Update: ReadMe, Reference Sheet source files (PDFs not yet rebuilt)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5484 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-11 22:33:41 +00:00
Chris Morris
8d05aa1bc6 Adjust way break pattern positioning is calculated, to make things easier for custom BPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5483 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-08 21:49:16 +00:00
Chris Morris
639a81a1ef Fix some more visual effect display bugs 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5482 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-08 21:11:49 +00:00
Chris Morris
13befe844f Fix collision bug 
Fix visual effect display bug
Reintroduce visualeffect.scale() function for convenience


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5481 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-08 18:23:49 +00:00
Jens Ayton
1d3cd2e172 Fixed a logic bug in calculation of seed position for explosion debris (from r5363). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5480 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-07 23:05:51 +00:00
Jens Ayton
6824656a22 Removed an unused prototype. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5479 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-07 23:04:58 +00:00
Chris Morris
9913b4b141 Fix potential bug in collision testing. Unfortunately it's not the only bug in collision testing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5478 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-07 21:59:48 +00:00
Chris Morris
077ffcf72a Redo scaling of visual effect entities: 
- independent scaling in X, Y, Z
 - do it in display rather than by rescaling the meshes (so meshes can be properly immutable again)


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5477 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-07 17:56:57 +00:00
Chris Morris
116d0baa10 Add JS event equivalents for new ATTACKER_MISSED and CASCADE_WEAPON_DETECTED AI events. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5476 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-06 20:36:35 +00:00
Nikos Barkas
25194636a7 Made station roll read/write to JS by means of the 'roll' OOJSStation property. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5475 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-05 23:50:01 +00:00
Chris Morris
61d3c087e3 Change compass target to be a weakref: should stop crashes when accessed in interstellar space 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5474 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-05 18:26:16 +00:00
Nikos Barkas
1ff9fe3b99 Fix for SDL builds warning. Sunentity protocol should now be fully implemented for FlasherEntity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5473 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-05 09:48:00 +00:00
Chris Morris
8e14bccaae Fix another viseffect frustum cull bug 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5472 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-03 15:54:04 +00:00
Eric Walch
1e2108056a Removed the complex check for an existing commander at the last saved location. There are a lot of situations were you still want to proceed with loading a saved game in such situations. e.g. you moved your files on your disk or want to retrieve them from an external source. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5471 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-03 14:56:35 +00:00
Chris Morris
b3afb60655 Fix frustum culling bug in visualeffect subents 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5470 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-02 21:33:39 +00:00
Jens Ayton
44db56d432 Renamed drawEntity:: to drawImmediate:translucent: and drawSubEntity:: to drawSubEntityImmediate:translucent:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5469 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-02 20:22:26 +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