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

26 Commits

Author SHA1 Message Date
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
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
4fac70192f Cleaned up oolite-default-ship-script.js for strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3963 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-03 00:27:00 +00:00
Jens Ayton
dc07d56bf6 Disabled strict mode for oolite-default-ship-script.js for now. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3962 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-03 00:16:23 +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
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
a94d4b5bac - station_roll can now be used inside individual stations' shipdata.plist. If not found, use the systemwide override inside planetinfo.plist if defined, or standard station roll, as before. (trunk) 
- more copyright fun: replaced instances of em dash with '-' to help syncronise updates better, added copyright info to the profiling stopwatch.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3656 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-04 22:32:30 +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
Jens Ayton
213ce5a28f Added default script for player ship, so it isn't a special case. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3527 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 17:53:25 +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
Jens Ayton
a79eae0acc Better error logging when loading a saved game fails. Fixed up some script comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3080 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 23:07:23 +00:00
Marc
da8da6183d bugfix for bug #15454 - legacy scripts inside CARGO_SCRIPTED_ITEMs now work again. Tested with ore processor 1.52. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2375 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-09-03 23:27:18 +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
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
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
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
Jens Ayton
01c7ccbc10 Bumped version numbers (trunk to 1.72, 1.71-maintenance to 1.71.1). #ifed out redundant like_ship check in ShipEntity, with log message in event of it turning out not to be redundant. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1577 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-04-22 10:44:26 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +00:00
Jens Ayton
e2a2be7f46 Started looking at laser drawing bug, ended up doing lots of cleanup of subentity handling instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1456 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-05 00:06:05 +00:00
Jens Ayton
b73d9d98ec Work on replacing two different matrix types with different problems with one type that may have less problems. (I need the matrix to implement generalized cameras. I need the cameras to implement generalized lights. I need the lights to solve a problem with shaders. There might be an additional advantage or two to being able to place a camera anywhere rather than attached to the player, though.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1385 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-17 00:50:01 +00:00
Jens Ayton
d3db589df3 Added 'don't use runLegacyScriptActions()'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1335 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-02-01 18:27:54 +00:00
Jens Ayton
a877783cea Bumped versions for trunk and 1.70-maintenance to 1.71 and 1.70.1 respectively to help avoid confusing them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1259 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-03 18:05:21 +00:00
Jens Ayton
df05fbd65f Updated version numbers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1250 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 20:43:08 +00:00
Jens Ayton
56eb8f1738 Renamed a bunch of script handlers and gave NPC scripts some events that only player scripts got before. Added compatibility mechanism to point out uses of old handlers. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1247 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-12-02 00:50:06 +00:00
Jens Ayton
3fbc24887d * All ships now have a JavaScript script attached, allowing JS scripts to 
add behaviours to any ship.
* Legacy script_actions, setup_actions, launch_actions and death_actions
  handled through default JavaScript script.
* In order to implement the above, JS Ship now has a runLegacyScriptActions
  method. This is not to be exposed as an "official" method, though, since
  we might want to change the mechanism -- for instance, to "compile"
  legacy scripts into JS. Handling dynamically-generated legacy scripts in
  that case would be a significant complication.
* Updates for Mac OS X 10.5 "Leopard".
  - Errors on reading/writing plist will not cause a crash if building
    against the Leopard SDK. (I have no intention of requiring Leopard any
    time soon, but future-proofing is good.)
  - OOWeakReference is now more efficient when running under Leopard, by
    implementing the new "fast forwarding" mechanism.
  - Threads now have names set under Leopard, which may provide debugging
    advantages.
  - Fixed some new build warnings for new version of apple-gcc.
  - Updated type declarations to identify Oolite saved games as property
    lists.
* Cleaned up PlayerEntityControls.m somewhat. Moved method declarations
  into files, fixed indentation, broke up monster giant method of doom.
* Script-generated asteroids now behave like system populator-generated
  asteroids (As Seen on BB[TM]).
* Minor optimizations and simplifications of legacy script engine.
* JS System.filteredEntities() now has sensible behaviour if predicate
  throws an exception: the predicate is not called again, and null is
  returned. The exception is reported and not rethrown.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1240 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-11-23 15:04:14 +00:00