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

3416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
0aba4b0971 Removed support for changedScriptHandlers.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4130 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 19:39:03 +00:00
Jens Ayton
4ef5f4a8b0 New JS method global.defaultFont.measureString(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4129 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 18:24:52 +00:00
Jens Ayton
68c0a3c5b3 Build fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4128 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 17:48:46 +00:00
Jens Ayton
e5bcbdc5b7 Support for explicitly-sized overlays and backgrounds (bug #17201). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4126 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 17:06:26 +00:00
Jens Ayton
95b9116437 Infrastructure for specifying overlay/underlay height. Also fixed default value of runMissionScreen() spinModel setting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4125 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 15:37:01 +00:00
Nikos Barkas
20687d8f71 Fixed SDL build warning (-recenterVirtualJoystick is a Mac-only method). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4124 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 14:39:41 +00:00
Jens Ayton
76630d9f2b Cleaned up some JavaScript object coersion stuff, and fixed a crasher in callObjC(). Oddly enough, this is work on bug #17201. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4123 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 14:39:27 +00:00
Jens Ayton
027dbea907 Renamed OpenGLSprite to OOTextureSprite for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4122 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 13:53:52 +00:00
Jens Ayton
15020e406a Implemented originalDimensions property for textures, indicating size of texture before any rescaling (as per bug #17201 part 1). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4121 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-23 13:51:11 +00:00
Jens Ayton
167045d36c Disabled nonsensical special case for NPC ships with custom missile launch positions inside the bounding box. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4120 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 20:40:57 +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
Nikos Barkas
eafb5ffe2f Switching weapons off now deactivates turrets as well. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4118 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 15:25:31 +00:00
Jens Ayton
8bf132296c Support for Mac touchpad release events, and better windowed mouse control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4117 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-22 14:14:46 +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
591878e4da Unrooted timers are now reported in the log instead of as a JS warning, to fix a crash when dumping the stack during a garbage collection. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4115 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-21 22:44:24 +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
bb8ee9280d Work on scriptable number formatting for localization. (If this seems like overkill, you probably haven’t considered the problem in enough detail.) Currently supports integers and credits quantities, and is used for displaying credits quantites in UI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4112 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-21 01:00:25 +00:00
Jens Ayton
36ac28a680 Oldjs compatibility fix. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4111 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 22:12:23 +00:00
Jens Ayton
c5ac9ca5eb Fix for random time limiter attacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4110 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 22:04:25 +00:00
Nikos Barkas
c72aae9f69 Eliminated possible crasher warning on SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4109 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 21:40:23 +00:00
Jens Ayton
d1a8c1ccab Binary search for JS constToString, just because. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4108 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 21:03:35 +00:00
Jens Ayton
47823aff60 Nothing to see here, move along. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4107 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 20:42:53 +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
3b6b3655e3 Raised script time limit in debug builds to 0.2 seconds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4104 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 19:47:18 +00:00
Jens Ayton
cf1128ea7b [Mac] Fixed inspectors. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4103 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 19:31:09 +00:00
Jens Ayton
7540e133e1 Replaced various literal 0.707s with M_SQRT1_2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4102 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 15:21:10 +00:00
Jens Ayton
28152d9031 Added mission screen parameter spinShip and mission property displayModel. Also fixed bug where non-JS-visible ships turned up in system.allShips. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4101 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 15:07:43 +00:00
Jens Ayton
4da54f3dc8 Softened on mission.setInstructions[Key](): passing no argument is now a warning, while passing explicit undefined is an error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4100 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-20 14:38:32 +00:00
Jens Ayton
968adda264 [Mac] Added Snow Leopard feature bundle. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4099 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-19 15:14:07 +00:00
Jens Ayton
36f468b26a Removed OOLITE_HAVE_JOYSTICK macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4098 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-19 15:06:17 +00:00
Jens Ayton
3159c50308 Disabled JSOPTION_STRICT by default because it causes spurious warnings in various weird cases. ES5 strict provides many of the same benefits in a less arbitrary fashion. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4097 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-19 15:04:58 +00:00
Jens Ayton
1e92dbf1c3 Deployment build fixage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4096 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 20:05:49 +00:00
Jens Ayton
3f1e7ae3b5 More futzing around with enums and string constants. Also, setting player.ship properties to invalid values now throws an exception rather than halting script; this should be extended to other classes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4095 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 19:20:50 +00:00
Jens Ayton
25b5161d0f Skip bookkeeping frames in stack dump; add "new" in front of non-native constructors in trace. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4094 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 17:01:53 +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
708fb86642 Made the canonical global name for the debug console "console", because having different names in different contexts is silly. Kept "debugConsole" as a compatibility alias. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4091 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 15:23:13 +00:00
Jens Ayton
dfa758ea6b More moving and renaming of constants and the stringifiers that stringify them. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4090 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 15:12:48 +00:00
Jens Ayton
8c9c521a15 JavaScript execution tracing facility, piggybacked on profiling system. Invoked with console.trace(function, [this]). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4089 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 13:42:01 +00:00
Jens Ayton
7f2ed7eec1 Rearranging headers to reduce interdependence. OOJavaScriptEngine.h doesn't include all profile management stuff (and has some big blocks of preprocessor hacks moved into new files, OOJSEngineNativeWrappers.h and OOJSEngineTransitionHelpers.h). Started breaking up ill-concieved OOTypes.h (entirely my fault) and putting relevant declarations in more sensible places. To support this, some OOConstToString functions are now declared in Entity.h and ShipEntity.h, and have been renamed while I'm at it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4088 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-18 13:39:12 +00:00
Nikos Barkas
e4599eaf1e Fixed double-firing timers on Windows when interval was set to 1.0, 2.0, 3.0,... etc. seconds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4087 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-17 20:25:42 +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
dec2c7332b JavaScript functions are now included in profiles (requires newjs, native ObjC exceptions and MOZ_TRACE_JSCALLS). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4083 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 22:03:35 +00:00
Jens Ayton
8f6a8cad98 Fixed console macros and tweaked some console property visibilities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4082 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 18:19:52 +00:00
Jens Ayton
a8848ade0c Argument validation for JS mission.setInstructions[Key]. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4081 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 18:14:30 +00:00
Jens Ayton
7428f43c94 Rolled back horrible, confusing startup behaviour from r3320 which I rejected at the time but didn't get around to fixing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4080 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 17:58:13 +00:00
Jens Ayton
a6e4a22566 Tweaks to OS X sound inspector. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4079 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-16 15:41:28 +00:00