3216 Commits

Author SHA1 Message Date
Jens Ayton
1386f390c6 Update script tweaks
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3914 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-29 00:59:57 +00:00
Jens Ayton
76dc33c249 Oolite-newjs now automatically downloads SpiderMonkey and libpng code as necessary.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3913 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-29 00:33:33 +00:00
Jens Ayton
e2f537ef59 Mac Oolite-newjs builds now use an Xcode project to build libjs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3912 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-28 22:56:25 +00:00
Jens Ayton
fc134f42c9 Fixed oldjs NSDictionary -> JS Object coersion handler. Fixed return value of console.getProfile().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3911 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 15:39:38 +00:00
Jens Ayton
6d86b802e8 JS String and Number objects can now be coerced to NSString and NSNumber using JSObjectToObject(). In practical terms, this means callObjC() now works on them. Also cleaned up some error messages pertaining to callObjC().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3910 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 14:04:32 +00:00
Jens Ayton
dc5e27ada4 Built-in (more precisely, OXP-defined) console macros are now separate from user-defined ones; they take precedence and cannot be deleted or overwritten.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3909 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 13:28:06 +00:00
Nikos Barkas
d785ddeac5 Fixed problem with returning the 'EQUIPMENT_UNAVAILABLE' intern JS string.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3908 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 12:36:37 +00:00
Jens Ayton
17bc2db337 Use interned strings for JS Ship.equipmentStatus().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3906 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 12:07:20 +00:00
Jens Ayton
3af03a2988 Fixed 32-bit Mac debug builds, which someone had sabotaged.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3905 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-26 11:14:40 +00:00
Nikos Barkas
309b1b7d0f Added the optimized versions of the new JavaScript library for the Windows port, for mega-speed effect. The Winodws build can now automatically pick the correct JS DLL when pacakging up the installation image.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3903 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-24 11:04:03 +00:00
Jens Ayton
db6146d61f Fixed three oldjs crashers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3901 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-22 14:34:22 +00:00
Nikos Barkas
82fa7788f3 Switched Windows build back to using JS 1.70 for now.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3900 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-21 23:40:20 +00:00
Nikos Barkas
ff2229b9a6 Added new JS binary, headers and import library to the Windows build. New or old JavaScript to be used can now be selected and set from the GNUmakefile, under the JS_ECMAv5 setting. The Windows build is now set to use the new JavaScript.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3899 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-21 21:54:43 +00:00
Jens Ayton
5d327cce02 JS System methods which take relativeTo and range arguments now throw exceptions instead of terminating silently when passed bad values.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3898 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-21 21:07:00 +00:00
Jens Ayton
a109ca603f Fixed oldjs crashes in system ship-finding methods, and reduced number of #if OO_NEW_JSes in the process.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3897 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-21 21:02:38 +00:00
Jens Ayton
6254ca15a5 Added JS Ship.cruiseSpeed property.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3896 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-21 19:21:19 +00:00
Jens Ayton
d7489498a0 Fixed crash on mission screen callback in newjs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3895 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 23:54:36 +00:00
Jens Ayton
8271029216 Crasher in JS timer handling.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3893 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 20:58:34 +00:00
Jens Ayton
049ac7a1bf Fixed JS timers in newjs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3892 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 20:08:43 +00:00
Jens Ayton
5df8a8cb61 Force cache rebuild when swapping JavaScript engines.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3891 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 19:25:22 +00:00
Jens Ayton
795b1ffef1 Fixed buggy argument handling in Vector3D.interpolate() under newjs
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3890 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 19:22:52 +00:00
Jens Ayton
39ad92b7a6 Added log header line for newjs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3889 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 19:20:47 +00:00
Jens Ayton
dbc1612ef7 Fixed JS memory management-related crash under old JS.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3888 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 19:16:20 +00:00
Jens Ayton
3048213ec0 Fixed Vector3D and Quaternion constructors under new JS regime.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3887 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 14:19:57 +00:00
Jens Ayton
2aa48deafc Fixed newjs method calls. Game now runs and console works, but crashes in unit tests because constructors are written wrong.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3886 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-19 13:52:00 +00:00
Jens Ayton
d6179364bf Added tests for JS Vector3D and Quaternion toString() and toSource(), and fixed some silliness in Quaternion.toString().
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3885 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 23:01:49 +00:00
Jens Ayton
abdf19a77a More requestificiation.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3884 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 23:01:06 +00:00
Jens Ayton
25b8310c6c New JS work: fixed a rooting error and added a bunch of requests.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3883 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 22:15:27 +00:00
Nikos Barkas
03108fa0a8 Use correct override for getting the joystick name from the OOSDLJoystickManager.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3881 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:58:25 +00:00
Jens Ayton
858d1e2c4a Fixed non-Mac builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3880 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:25:24 +00:00
Jens Ayton
631e127cd0 Makefile update with less stupidity.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3879 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:20:15 +00:00
Jens Ayton
05999d2945 Makefile update.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3878 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:19:31 +00:00
Jens Ayton
5bf81d659d Joystick code cleanup
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3877 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 18:16:44 +00:00
Nikos Barkas
d4e3c9ae71 Removed confusing comment from previous commit.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3876 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 16:51:30 +00:00
Nikos Barkas
12c8892bfc Fixed SDL builds breakage.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3875 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 16:49:30 +00:00
Jens Ayton
88897f46f2 Fixed project dependencies for joystick stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3874 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 15:58:52 +00:00
Jens Ayton
010578a64f Proper header comments for Leopard support bundle; added Leopard support bundle to newjs project.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3873 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 15:41:07 +00:00
Jens Ayton
60a4feaeef Updated hall of fame.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3872 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 15:19:27 +00:00
Jens Ayton
6d3b505d77 Landed Mac OS X joystick support.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3871 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 15:17:51 +00:00
Jens Ayton
3a463348bb Joystick refactoring.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3870 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 14:56:39 +00:00
Jens Ayton
3c4a8b3835 Preparing to merge in contributed Mac OS X joystick support.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3869 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 14:14:13 +00:00
Jens Ayton
daa8f64ddf More minor stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3868 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 13:37:18 +00:00
Jens Ayton
0234095de2 Minor stuff.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3867 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-18 13:36:19 +00:00
Jens Ayton
ad56d954d4 Added Xcode project for new JS. Currently only builds x86_64 debug.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3862 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 15:08:35 +00:00
Jens Ayton
cf81db538f Work on JavaScript API update: began work on meeting thread-safe API requirements. Game now loads and runs with trunk libjs.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3861 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 14:45:55 +00:00
Jens Ayton
e83e9a42db Work on JavaScript API update. Milestone: compiles with new JS, but won't link due to dependency issues.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3860 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 13:02:45 +00:00
Jens Ayton
10639d6f52 Work on JavaScript API update.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3859 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 12:47:53 +00:00
Jens Ayton
776b504220 Fixed an unused variable warning in optimized builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3858 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 11:47:45 +00:00
Jens Ayton
e7048059c8 Restricted JS takeSnapShot() to debug/test release builds.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3857 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 11:46:59 +00:00
Jens Ayton
9edf4e9f5e Work on JavaScript API update.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3856 127b21dd-08f5-0310-b4b7-95ae10353056
2010-12-17 11:28:03 +00:00