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

354 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
aa15e3e1bc Lasers: worsen aim a bit to compensate for beam rate of fire 
Parcels: fix contract time calculation, increase effect of reputation on price


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5391 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-10-02 20:58:51 +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
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
Chris Morris
cc769b14b6 Make background for parcel delivery maps come from screenbackgrounds.plist 
Add some more (unused in core) entries to screenbackgrounds.plist so that OXPs can define slightly different backgrounds for F6 screens and their missionscreen alternates. 


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5334 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-17 17:53:08 +00:00
Chris Morris
40c975ffcb Fix potential crash with interfaces. 
Remove "far too late" parcel contracts from the list.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5329 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-15 20:18:56 +00:00
Chris Morris
266294005b - Add "interfaces" mechanism to stations (F4) to allow "pull" rather than "push" access to mission screens. 
- Add parcel deliveries to interfaces so that there's something there.
- Tweak mission screen options to add colour to choices, for parcel consistency with r5320.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5327 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-14 19:49:53 +00:00
Jens Ayton
fa2cf4c9f5 Added oolite-default-effect-script.js to Xcode project. Removed copy-and-pasted comment about legacy script actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5303 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 18:46:54 +00:00
Chris Morris
5ff5dc09fd Allow scripts and scriptInfo to be attached to visual effects. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5299 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-09-08 14:51:45 +00:00
Chris Morris
9f22081e2b Wormholes: 
- set wormhole exit speed to 25% max ship speed
- add small perpendicular displacement to ships following the leader
- special case treatment where player is both following and being followed
- activate Eric's wormhole positioning code now it is safe to do so

AI:
- fix bug in stick refactoring causing problems with pitch and missile tracking
- tone down in-combat injector usage (fleeing still at full speed)
- tune "back off for another attack run" behaviour
- increase general laser accuracy for combat (though still not as high as 1.76, to compensate for overheating changes)
- apply SIX and TWELVE behaviour to bad pilots not good pilots
- make sure the Constrictor always has positive accuracy 0-5


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4989 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-06-06 10:02:31 +00:00
Eric Walch
9e4f5f4cb3 - The used cargo space is now shown in the long description on the equipment screen. 
- The thargoid plans mission now updates the time when awarding equipment.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4908 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-05-05 15:18:45 +00:00
Chris Morris
919fa44134 Adjust experimental missile damage calculations. Collision velocity calculation 
is improved, and velocity component of damage is capped. Thanks to Switeck for test results on previous version.
Also clarify equipment.plist comments


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4884 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-26 21:37:49 +00:00
Chris Morris
11f70da5f7 Adjust missile damage to account for relative velocity. 
Exact values in oolite-missile.js are provisional and may need to be adjusted after wider testing.
Should get the best of both low and high frame-rate behaviours when it's finished.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4868 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-21 12:12:05 +00:00
Chris Morris
590b2b407f Better way of setting and calculating missile damage 
- revert r4853 changes to dealEnergyDamageAtDesiredRange
- instead, introduce ship.dealEnergyDamage(damage,range)
- apply new function to stock missiles, change default ship script for missiles


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4861 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-19 20:05:30 +00:00
Eric Walch
2c2e3b416a - the restored planet shader files from r4818 now also work on mac builds 
- escorts launching from stations, now correctly have their mothers scanClass

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4825 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-04-01 09:59:08 +00:00
Eric Walch
cb9e2a2cee - On scooping the cloak, the cloak now becomes repairable in tech level 15 systems. 
- Improved the docking approach when arriving from the backside of a station.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4800 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-03-10 15:19:44 +00:00
Eric Walch
bb50cc8433 - takeSnapShot() is excluded from the timelimiter. 
- scooping constrictor pilot without killing the ship no longer gives a success message.
- activating a "becomeEnergyBlast" or "becomeExplosion" within a shipDied event, no longer triggers a new shipDied event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4794 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-03-04 16:04:45 +00:00
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 16:08:14 +00:00
Michael Werle
cb2d00a924 Bump version number to 1.77; start new Changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4691 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 15:14:11 +00:00
Nikos Barkas
c665a084d8 MNSR step 1: Rolling version number to 1.76. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4674 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 17:51:19 +00:00
Jens Ayton
49c928fead Bumpy bumpy version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4579 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-12 07:32:26 +00:00
Jens Ayton
774c4b922b Versions that go bump in the night. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4550 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-09 20:50:15 +00:00
Jens Ayton
32e521da25 shipSpawned() now fires for the main station, but launch_actions still do not. See http://aegidian.org/bb/viewtopic.php?f=3&t=9520 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4502 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-01 16:46:15 +00:00
Jens Ayton
cfb869eba9 Version bump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4472 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 12:21:36 +00:00
Jens Ayton
2cf7cfea37 Preliminary 1.75.1 release notes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4456 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 22:02:52 +00:00
Jens Ayton
bce1bf09d8 Style tweak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4440 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 22:34:35 +00:00
Eric Walch
d915a49dcd - Changed the priority order for the docking computer in the mainStation eagis. 
- Fixed a deprecated (but probably never used) command in the cloaking device script.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4438 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 20:55:48 +00:00
Jens Ayton
1d5edda0d0 Correct script target for legacy script_items in CARGO_SCRIPTED_ITEM scoopables. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4401 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-24 19:03:24 +00:00
Jens Ayton
85a85701f0 Commented on SystemInfo.systemsInRange(). Ideally, it would have been deprecated in 1.75 in favour of system.info.systemsInRange(), but it wasn't and in fact only SystemInfo.systemsInRange() works in 1.75. SystemInfo.systemsInRange() is now discouraged, and will soon be undocumented. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4390 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 20:16:44 +00:00
Jens Ayton
5a83148e65 Fixed SystemInfo.sytemsInRange() and SystemInfo.prototype.systemsInRange() (broken in prototype fixup). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4389 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 20:09:30 +00:00
Jens Ayton
79949f2eba Version bump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4383 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 09:51:22 +00:00