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
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
Chris Morris
6c87f5c487 Fix various mission screen / parcels bugs 
GUI_SCREEN_INTERFACES now triggers guiScreenChanged
GUI_SCREEN_STATUS now triggers guiScreenWillChangeTo
Parcels script now has an API to add parcels to list
Parcels script now has a variable to set a custom overlay


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5435 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-19 18:05:03 +00:00
Jens Ayton
cf71ebe559 Misc cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5434 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-18 20:13:35 +00:00
Chris Morris
dae5fa6466 Allow mission screens (while docked) to choose their exit screen. 
Update parcels script to exit to the interface screen.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5433 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-18 18:26:37 +00:00
Chris Morris
ecb5a1ada6 Possible fix for collision detection bug 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5432 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-17 19:44:12 +00:00
Chris Morris
abaa06a2f9 Fix interaction between mining laser and cloak 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5431 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-17 16:05:01 +00:00
Chris Morris
1124895630 Fix error in multi-paging of manifest screen with lots of parcel contracts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5430 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-16 20:58:04 +00:00
Nikos Barkas
ea664c901c Fixed minor warning on GCC 4.3.2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5429 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-14 14:20:51 +00:00
Chris Morris
13e965a60d Add station.market, station.setMarketPrice(c,p), station.setMarketQuantity(c,q) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5428 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-14 13:37:13 +00:00
Chris Morris
f3027cfcdf Fix some odd behaviour with aft laser tactics, hopefully without introducing other problems. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5427 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 22:55:23 +00:00
Chris Morris
7ecd1f84bf Fix error in parcels scripts. 
Document "interfaces" entry in screenbackgrounds.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5426 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 19:13:39 +00:00
Jens Ayton
e65ec2f154 Cleaned up some noise in OOJSShip. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5425 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 17:06:27 +00:00
Jens Ayton
99f2065b9b Fully integrated new string expander. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5423 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-12 12:49:55 +00:00
Jens Ayton
99b5d80ed0 [Mac] Converted icons to 10.5-compatible format. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5422 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-11 21:41:24 +00:00
Chris Morris
1f5a4bc8c1 Cleanup, increment cache version since last commit changed scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5421 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-11 21:18:41 +00:00
Chris Morris
dccd6497bc - Add "allowInterrupt" parameter to mission.runScreen. If set, function keys still work within the mission screen, exiting it *without callback*. Intended mainly to allow interfaces to blend in with the main GUI a little better. 
- Applied "allowInterrupt" to parcel contracts.
 - Consequential change to player.ship.targetSystem to allow setting from shipWillLaunchFromStation


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5420 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-11 21:14:02 +00:00
Chris Morris
a8560f0ad8 Fix silly mistake in visual effect / break pattern interaction. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5419 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-11 20:15:53 +00:00
Jens Ayton
c2a1122dfd Spinny cobra is now PlayerProxyEntity, as intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5418 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 20:28:23 +00:00
Jens Ayton
6e37e3d15f More fiddling with startup logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5417 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 18:33:42 +00:00
Jens Ayton
f4d8901bbe Got tired of the confusion about random number generators and added OOReallyRandom(), which is guaranteed not to be used for any sort of repeatable value anywhere, and is seeded exactly once. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5416 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 18:32:16 +00:00