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

178 Commits

Author SHA1 Message Date
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
Jens Ayton
b17b6ba45a Removed JS compatibility warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4381 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-20 09:27:51 +00:00
Jens Ayton
db44f0b94c Trumble script revision. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4347 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-13 17:29:04 +00:00
Eric Walch
d54f6ac448 Changed trumble mission to only offer at the main station as always was intended but was already wrong implemented in the legacy version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4346 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-13 13:10:49 +00:00
Jens Ayton
9546b7b11b Removed obsolete ES5 compatibility functions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4339 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 19:31:27 +00:00
Jens Ayton
27bac3ca61 JS audit: OOJSShip. Moved addPassenger() and awardContract() to PlayerShip where they belong. Also made them not print warnings when conditions aren't fulfilled, because returning an error flag _and_ logging a warning is an unhelpful combination. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4292 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 01:13:21 +00:00
Jens Ayton
d1db0f0f64 JS formatInteger() now punts on *very* large values correctly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4273 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 22:45:30 +00:00
Jens Ayton
267ffc8697 JS formatInteger() now punts to default JS behaviour instead of returning an error string for large values. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4272 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 22:41:28 +00:00
Jens Ayton
b346c2d28a [Mac] Dock tile plug-in now follows screen shots directory around. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4255 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-07 15:25:51 +00:00
Jens Ayton
150dd2b9a5 JavaScript console and global object are now rebuilt when resetting the game, to make it impossible to smuggle information across sections. There seem to be minor JS-related leaks as a result. Be on the lookout for exciting new crashers! As an arguably unfortunate side-effect, the console currently doesn't work when resetting into strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4210 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-01 21:12:38 +00:00
Jens Ayton
11df41547a [Mac] Hopefully fixed horrible-loud-noise bug (bug #17214), and definitely fixed quieter popping noises at the end of sounds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4187 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 21:40:03 +00:00
Jens Ayton
bce687613f Disabled TAF in deployment builds (and also shader debug hotkey, and extra info on FPSometer). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4184 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-29 20:45:17 +00:00
Jens Ayton
b050faa3b2 Experimental support for letting station scripts determine whether a ship is physically able to dock. Disabled because of collision detection problems with inactive docking ports. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4165 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-27 19:50:13 +00:00
Jens Ayton
399e369606 Fixed default escort function (first four ships no longer try to fly inside mother). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4119 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 20:38:44 +00:00
Jens Ayton
f99dd38018 Escort positions are now cached. Fixed copying of scripts under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4116 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 13:52:38 +00:00
Jens Ayton
c2059960be coordinatesForEscortPosition can now actually be overridden. Default implementation avoids bit-twiddling hacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4114 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-21 20:45:35 +00:00
Jens Ayton
5cef2b972d Why can't you just read my mind, svn? (Missing file) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4113 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-21 09:04:17 +00:00
Jens Ayton
c8d6b1cf44 Simplified default coordinatesForEscortPosition(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4106 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 20:23:56 +00:00
Jens Ayton
214d87e63c Escort formations can now be defined in JavaScript by implementing coordinatesForEscortPosition(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4105 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 19:52:01 +00:00
Jens Ayton
bd9000ee12 Console input is now reported as <console input> instead of oolite-debug-console.js:779 in stack dumps, profiles and traces. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4093 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 16:30:54 +00:00
Jens Ayton
3e8696a606 Redefined global.worldScriptNames in JavaScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4092 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 15:30:39 +00:00
Jens Ayton
9a35273d39 [Mac] Build fix for JS profiling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4085 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-17 07:47:37 +00:00
Jens Ayton
f48c751092 Fixed timer sorting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4084 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 22:47:26 +00:00
Jens Ayton
08519fb6be JS special.jsWarning() now skips one stack frame as intended. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4077 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 14:04:17 +00:00
Jens Ayton
ded012d0e5 Put all of prefix script in a nice, sanitary closure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4053 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-12 21:36:10 +00:00
Jens Ayton
ccd30cb8a9 Added compatibility accessors and warnings for misuse of JS System and Player. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4052 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-12 20:52:05 +00:00
Jens Ayton
48abeeedef Renamed Ship.prototype.roleProbabilities to Ship.prototype.roleWeights (with compatibility accessor). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4050 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-12 14:29:55 +00:00