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

982 Commits

Author SHA1 Message Date
cim
68cbeed17b Start system populator framework. 
Adds buoys, nothing else
 2013-07-01 13:46:13 +01:00
cim
b702e280e9 Remove strict_mode settings from equipment.plist 
(Comment out rather than strict_mode_only out energy bomb; this doesn't affect the Energy Bomb OXP at all)
 2013-06-29 10:43:45 +01:00
cim
848e59ce19 Remove Strict Mode 
Replace strict mode control with OXP enable/disable control
Display OXP setting on new game ship parade to make it clearer to users why their OXPs aren't loading
Adjust descriptions
Remove all gameplay differences other than OXP loading in strict mode
 2013-06-29 10:21:35 +01:00
AnotherCommander
e63213621d Added missing fuel scoop icon to small hud. 2013-06-16 19:57:48 +02:00
Chris Morris
6bb8e901f4 Padding on parcel contracts still wasn't quite sufficient for really short trips, which could expire before you got to the station. Add four hours to deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5678 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-12 00:23:15 +02:00
Jens Ayton
dd53a44b82 Set up submodules 2013-05-11 21:32:45 +02:00
Marc
d6d9568341 - regression fix: OXPs can show commander 'kills' once again - syntax fits current string expander, though. - fix: language OXPs can now translate thargoid character name & short description, as originally intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5674 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-05-04 13:05:59 +02:00
Chris Morris
c01af88cab Fix crash on failed mesh load, plus other bugs exposed at same time 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5662 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-03-29 13:56:43 +00:00
Eric Walch
9e2ffb6ab2 Make sure ships don't stay locked on dead ships as primary target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5624 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-24 20:05:28 +00:00
Nikos Barkas
50895952b2 Version bump to 1.77.1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5623 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-21 10:15:06 +00:00
Chris Morris
fa6c66235c Bug fixes: 
- use lighting for cloud layer to avoid oddities at low ambient levels
 - include cargo premium and passenger advance in new contracts data
 - check case where escorts could end up scan CLASS_NOT_SET


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5614 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-12 15:01:27 +00:00
Nikos Barkas
0078af5183 Removed stale references to oolite-missile.js from shipdata. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5610 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-07 11:14:56 +00:00
Chris Morris
3d6ceaf44e Adjust missile detonation for better compatibility with 1.76 code 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5604 127b21dd-08f5-0310-b4b7-95ae10353056
 2013-01-05 16:28:11 +00:00
Nikos Barkas
afb09f9a7e Here goes another year. Happy 2013. The Reference Sheet and the Readme still need to have year references bumped. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5596 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-31 09:00:28 +00:00
Chris Morris
2126f420bf Fix bugs found by Eric in contracts APIs 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5595 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-30 12:53:17 +00:00
Eric Walch
731a74d62e Fixed some oddities with scooped and than released escapepods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5594 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-29 10:19:33 +00:00
Chris Morris
6437f2211a Move virtual dock warning to $oxpDevelopment category. Should consider making this enabled in test builds by default later, but for now OXP developers can adjust it themselves if they want. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5590 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-27 17:10:56 +00:00
Chris Morris
e64f74399d Fix crash bug in trackCloseContacts functionality 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5576 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-14 18:24:19 +00:00
Chris Morris
a894b4dd63 Add some high level profiling log statements, since gprof seems to miss some of the time spent in various routines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5575 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-12-13 20:59:22 +00:00
Chris Morris
bef181932f Add property clock.adjustedSeconds, use to give better calculation of contract deadlines. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5549 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-29 10:47:11 +00:00
Chris Morris
8a1a34a492 Avoid parcel contracts which are likely to expire before the player even enters the system. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5547 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-27 20:08:44 +00:00
Chris Morris
2208333f70 Revert r5523 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5536 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-25 11:50:54 +00:00
Chris Morris
f8e0f48cc8 Increase size of deposit required for contracts to remove defaulting exploit 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5535 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-25 10:30:08 +00:00
Jens Ayton
07b05f6839 [Mac] Fixed some state management problems in legacy full screen controller. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5530 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-24 15:50:50 +00:00
Nikos Barkas
23de81392f Nitcpick: More 'professionally' sounding message when a distant hyperspace destination is selected. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5525 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-23 09:35:07 +00:00
Chris Morris
c30778b3b5 Update planetinfo.plist to preserve 1.76 planet descriptions 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5523 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-22 22:42:15 +00:00
Chris Morris
80f2f4f6da New engine flare appearance. (breaks Mac build again) 
Engine flare z size now does something. Values from 0.5-2.0 scale the flare compared with its 'normal' scale. All other values treated as equal to 1.0. shipdata.plist updated with new exhaust z-size parameters for completeness.
Slightly tweak laser turbulence parameter.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5521 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-11-22 19:55:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
76347c282b Tweaked startup logging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5415 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 16:44:54 +00:00
Jens Ayton
f3df081d5b Aliased scriptActionOnTarget: to safeScriptActionOnTarget:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5414 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-10 16:27:30 +00:00