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

4932 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chris Morris
603a934fa8 Add interfaces for cargo and passenger contracts. Including: 
- API to allow OXPs to insert contracts
 - New customsounds entries for contract acceptance and rejection
 - New choicesKey parameter to make choice unselectable
 - More than 5 contracts viewable at once


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5466 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-01 20:36:08 +00:00
Jens Ayton
fc0dfce101 Reduntant state is redundant. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5465 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-01 07:50:19 +00:00
Jens Ayton
79b3bf88ea Simplified sun OpenGL state. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5464 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-01 07:44:13 +00:00
Jens Ayton
db6ee25a0a Modified sun rendering to look better from inside atmosphere. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5463 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-01 07:33:36 +00:00
Chris Morris
4eaaf9ca6f Reduce laser shot persistence. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5462 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-31 21:36:24 +00:00
getafix
2b84808f5e Fixed newline warning on linux builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5461 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-29 07:45:03 +00:00
Jens Ayton
451f27ae77 Fixed super glowy nebulae while in atmosphere. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5460 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-29 07:15:12 +00:00
Jens Ayton
280640c487 Fixed billboards-in-the-mist bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5459 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-29 06:50:36 +00:00
Chris Morris
a9315ee0f5 Set up "old planets" with new GL operations. 
Make OPENGL_STATE_ADDITIVE_BLENDING inherit fog setting like the others.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5458 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 23:01:00 +00:00
Chris Morris
5a1da26c70 Another SDL GL warning fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5457 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 21:37:15 +00:00
Chris Morris
0301dd6959 Enable OO_GL_CHECK_HEAVY in debug builds (SDL) 
Fix splash screen GL settings (SDL)
Remove obsolete shipdata.plist line


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5456 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 21:29:27 +00:00
Jens Ayton
68dc9b7ade Fixed build with OO_GL_STATE_VERIFICATION but not OO_CHECK_GL_HEAVY. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5455 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 19:28:49 +00:00
Jens Ayton
fca44fedb2 Clamped down on pointless doubles in text drawing and HUD. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5454 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 18:27:27 +00:00
Jens Ayton
52e1bbdbb8 OpenGL state management reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5453 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 18:11:01 +00:00
Eric Walch
b43e39da92 The docking computer now correctly calculates the abort coordinates. Fixes the issue with the player auto pilot. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5452 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 16:00:14 +00:00
Jens Ayton
e6a0938a64 Minor improvements to LogOpenGLState(): ignore some flags we never touch, improved reporting of culling state. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5451 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 13:20:02 +00:00
Chris Morris
b2de37565d Fix bugs with docking clearance allocation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5450 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 11:16:10 +00:00
Chris Morris
23315623af Explicitly specify hermit scan class rather than relying on populator. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5449 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-28 09:10:02 +00:00
Chris Morris
6d6aafeb29 Optimise aegis checks, and a few other areas IDed by profiling 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5448 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-27 16:17:49 +00:00
Chris Morris
246838e284 Fix crash in case where station is destroyed between player entering dock and player docking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5447 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-27 12:48:00 +00:00
Chris Morris
e124d61d0a Fix aegis check for solar proximity 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5446 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-27 12:34:54 +00:00
Chris Morris
ce284f1a7d Clear controls on exit from mission screen 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5445 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-26 22:35:30 +00:00
Chris Morris
48a06e0eab Update aegis checks to include main planet, and fix a couple of edge cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5444 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-26 22:28:10 +00:00
Nikos Barkas
28e7367fcc Fixed weapon facing not being remembered when returning from custom views following an unpause. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5443 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-26 20:10:21 +00:00
Chris Morris
93f78b49f9 Add GUI_SCREEN_MISSION to guiScreenChanged 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5442 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-26 17:02:33 +00:00
Nikos Barkas
f4a286a0dc Experiment: Enable custom views rotation while in pause. Enabled for testing purposes, can be disabled and things can return to previous condition by defining the ALLOW_CUSTOM_VIEWS_WHILE_PAUSED macro to 0. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5441 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-26 07:52:34 +00:00
Chris Morris
2f25a7ae4f Increased playership thrust from injectors/torus now also accounted for in cancelling of newtonian velocity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5440 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-25 19:09:57 +00:00
Chris Morris
0bb61227dc A few AI tweaks for high-skill AIs to improve their aim and evasion 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5439 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-24 19:03:04 +00:00
Chris Morris
ca86fe68cd Tune aim_tolerance a little. 125/12 was too precise, but 250/24 is too wide. 190/18 seems to give more fun results in large fights. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5438 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-21 15:21:04 +00:00
Nikos Barkas
aa183b9f7b Fixed a in mission screens where double clicking with the mouse on a selection would disable further capability to select until the screen had been exited (parcels affected). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5437 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-20 10:35:35 +00:00
Jens Ayton
a20711ee4e Made isBoulder read-only for player. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5436 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-19 18:55:51 +00:00