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

59 Commits

Author SHA1 Message Date
cim
028fa0c8aa Merge branch 'master' into steady-state-ecosystem 
Conflicts:
	src/Core/Scripting/OOJSEntity.m
 2013-08-27 13:15:33 +01:00
cim
7db8688052 Update version from 1.77.1 to 1.79 2013-08-27 12:51:53 +01:00
cim
273b58b9a5 Adjust nova mission to new populator (and future ones) 2013-08-26 14:09:06 +01:00
cim
d169c64312 Adjust nova mission to use populator 
Removes normal traffic from the system when player enters, making it less likely they will escape by following a wormhole.
 2013-08-01 17:53:40 +01:00
cim
955cca855a Adjust nova sun settings a little 2013-07-10 20:09:16 +01:00
cim
380c9f8f4a Nova and related adjustments 
- increase default corona flare
- increase nova corona flare ranges to match
- make nova stars in expansion phase keep high corona flare
- make flare changes in nova mission use frame callback for smooth changes
 2013-07-08 19:01:38 +01: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
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
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
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
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
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
d1ae8972e5 Updating of strictly pointless copyright year thingies, yay! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3960 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-02 20:27:12 +00:00
Jens Ayton
c34f7e03f1 Enabled ECMAScript 5 strict mode in all built-in scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3958 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-02 17:54:54 +00:00
Eric Walch
7b0c256e99 - launchPolice and launchDefenseShip now add the ships in front of the launchQueue. 
- escorts can no longer, wrongly, escorting ships that already entered witchspace.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3760 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-24 11:12:36 +00:00
Jens Ayton
d16dc20f0b All scripts now use underscore prefix for custom properties. Also general cleanup and linting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3732 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-30 21:54:50 +00:00
Marc
cabe9792c7 Undocking in interstellar space is now possible: 
- to enable the new functionality, added the interstellar_undocking key to station/carriers. If "interstellar_undocking" = YES; , the station will remain where it is instead of moving to the nearest system, as it's always been the case up to now.
- quick fix to the nova mission to take this new possibility into account.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3725 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-28 12:01:39 +00:00
Jens Ayton
fc0d9a962d removeCargo now recalculates available cargo space. Specifying an empty string for a ship's script now acts as though no script was specified. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3723 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-27 20:06:55 +00:00
Jens Ayton
e94eddecea Accumulated minor cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3720 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-26 19:37:31 +00:00
Marc
2448a4f38f - OK, now all copyright notices inside the code should be up to date! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3654 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-03 18:45:37 +00:00
Nikos Barkas
084c2aaac7 - Fixed Nova mission not awarding gem stones upon successful completion. 
- Fixed 'Witchspace engine malfunction' message when arriving at a system where the sun has gone Nova.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3544 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 17:22:23 +00:00
Jens Ayton
0a9d8df271 Ported r3531 to maintenance, and bumped copyright years. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3533 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:32:10 +00:00
Eric Walch
12f2237af5 Replaced some "hasEquipment" calls by "equipmentStatus ===" 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3531 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:20:48 +00:00
Jens Ayton
a7d96ce760 Bumpez les versions! (Except the ReadMe, because I don't have Word, and the Debian stuff, because it confused me.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3518 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 15:40:59 +00:00
Marc
472b08f9af - fix: no more mission.runScreen flight related crashes. 
- more js missions cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2783 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-26 02:32:12 +00:00
Marc
3a92c0f7d1 - minor tweaks to missions, reworded one nova screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2762 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-19 02:31:04 +00:00
Marc
116d83f955 missionScreen RFC part III 
* yet more RFC bugfixes, there were quite a few not-quite-right bits, I _think_ I got all of them now...
* added titleKey as a mission.runScreen parameter, for use with missiontext.plist
* updated all internal missions to use the new mission API, some mission keys normalisation.
* fully tested & fixed both nova & trumbles missions.
* proper fix: no save when the sun is going nova!

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2759 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-18 21:58:32 +00:00
Marc
03a1728895 - Applied pv4's patch to trunk, with modifications. 
* ship.target = null now works as expected.
* adding trumbles to a ship has now got variable chance of working, depending on how many trumbles are already on board. Always works with 0 or very few trumbles.
- more cleanup: removed a windows compile warning, added a possible freeBSD bugfix, updated a js comment & autoindented Universe.m

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2720 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-11-04 20:57:11 +00:00
Marc
3cb2045315 - many nova bugfixes, should now be more difficult to break the nova mission. Sun flares up at random intervals inside the nova system. 
More testing required.
- systemInfo float values are now properly treated as numbers.
- minor code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2491 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-13 01:25:18 +00:00
Eric Walch
fee7ea9350 Corrected last nova script change. Stopped NPC ships from consuming fuel on deceleration. Increased NPC deceleration in speed range above max_speed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2478 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-11 19:21:46 +00:00
Nikos Barkas
72db4ee904 Fixed nova mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2461 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-10 15:49:51 +00:00
Jens Ayton
3c10a9b2be Bumped version number. Changed Mac system requirement to 10.4, and cleaned up target configuration in preparation for 64-bit support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2335 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-30 14:49:03 +00:00
Eric Walch
b585e1d0ed Added a JS method for player: addMessageToArrivalReport(message). Added a eventhandler that fires after the last arrivalReportScreen is shown. Changed the internal missions so they no longer overwrite this report. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2276 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-08-06 20:24:25 +00:00
Jens Ayton
1feeb63fd8 Ran all game scripts through JSLint (http://www.jslint.com/), but not console script because it's full of JavaScript 2-isms. The JavaScript 2 that isn't going to happen. Yay. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2182 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-05-22 22:45:02 +00:00
Nikos Barkas
a8c42528b2 Fixed a capitalization error in previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2137 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:59:56 +00:00
Nikos Barkas
e1cf86812a Commited Eric's updated nova mission script and added the nova_coward mission text. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2136 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-21 06:51:50 +00:00
Nikos Barkas
fc462e2e9f Commited a preliminary version of Eric's update to the Nova mission. The witchspace buoy now sends distress call messages when in the vicinity of the player, if current system is going nova. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2134 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-04-20 22:35:54 +00:00
Nikos Barkas
0a161f1c4d Fixed a 'control reaching end of non-void function' warning. Updated the nova mission script to use the new sun.hasGoneNova method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2057 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-02-12 17:39:42 +00:00
Jens Ayton
dd1ac56784 Simpler, more efficient equipment shopping code using OOEquipmentItem, with side effect that available_for_all now parses its value correctly.. Corrected use of fuzzyBooleanForKey: in r1855. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1856 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-15 01:10:01 +00:00
Jens Ayton
bbd9c0ef23 Ye bigge version number bumpe. Also removed deprecated JS stuff that's been around for two versions, and added :logOn and :logOff console macros. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1828 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-11-03 17:55:32 +00:00
Jens Ayton
3f07f2230c Fiddling with script converter, and bunch of scripting changes as a result: added player.rank, player.legalStatus, system.countShipsWithPrimaryRole(), system.pseudoRandomNumber, system.pseudoRandom100, system.pseudoRandom256; renamed Ship.shipDescription to Ship.name and Ship.shipDisplayName to Ship.displayName. Also, JS console script now strips out trailing line breaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1755 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-09-01 18:21:21 +00:00
Jens Ayton
e10591c31a Renamed JS Vector to Vector3D to avoid namespace issues in JavaScript 2.0. Added bounty property back to JS player. Oversight of player vs. player.ship in built-in scripts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1727 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-07 08:06:08 +00:00
cmdrjames
89d837daaf reduce deprecation warnings by changing player.docked to player.ship.docked 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1717 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-08-02 20:16:22 +00:00
Jens Ayton
53e5244d68 Fixes for patrol AIs (bug #14160). Marked Naval Energy Unit incompatible with standard unit. Check docked status in mission scripts for compatibility with scripts that force immediate launch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1686 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-07-08 23:15:33 +00:00
Jens Ayton
20e62f3151 Removed junk lines from nova script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1670 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-06-03 10:21:34 +00:00