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

418 Commits

Author SHA1 Message Date
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
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
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
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
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
Jens Ayton
96c9b7dbe6 More macro madness! JS scanClass and status strings are now interned singletons, for efficiency and also simpler callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4073 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 17:49:14 +00:00
Jens Ayton
a804bf350f Moved some enum definitions into separate table files, to avoid potentially bug-inducing redundancy (because I'm going to add more of that). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4072 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 16:14:34 +00:00
Jens Ayton
676ed097e9 Cleaned up JS debug helpers, made them easier to use and added some basic documentation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4071 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-15 14:25:49 +00:00
Jens Ayton
56f5e760ce Implemented frame callbacks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4035 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-08 17:03:04 +00:00
Jens Ayton
7067036207 Compatibility fixes for libpng 1.5.0, and some general libpng usage fixes. Didn't update to 1.5.0 for Mac because it's buggy and spews a bunch of spurious warnings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4030 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 15:13:58 +00:00
Jens Ayton
607a842dd8 [Mac] Libpng now gets its own Xcode project rather than skulking around in the main one. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4029 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 13:59:33 +00:00
Jens Ayton
e6e4c0e3d7 WHAT! is your quest?" 
"To make building Oolite under Mac OS X a simple, one-shot affair."
"WHAT! is the point?"
"Well, I don't know that. ... Aaaaaargh!"

The debug console split view is now set up programatically, obviating the need to muck about with the RBSplitView IB plug-in.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4026 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 01:41:36 +00:00
Jens Ayton
ae8383fe33 [Mac] Dock tile plug-in is now built by Build All config in main project, so Build All now requires Snow Leopard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4024 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-07 00:20:32 +00:00
Jens Ayton
6e515e60ed Big renaming of JavaScript helpers for internal consistency and clarity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4004 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-05 12:58:27 +00:00
Jens Ayton
01b4f5a6d7 Fixed Mac deployment build, and some other fiddling with export lists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4002 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-04 19:58:03 +00:00
Jens Ayton
473e4e5c5e Mac startup messages now reflect reality, and are more fine-grained in debug builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3976 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-03 17:25:11 +00:00
Jens Ayton
71793e8ef8 Removed Mac oldjs project and associated bits & BLOBs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3949 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-01-01 16:13:56 +00:00
Jens Ayton
08654dcef0 Xcode project cleanup. Build All target now works properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3931 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 23:01:15 +00:00
Jens Ayton
416c5c1498 Switching to newjs as Mac OS X default. ...and in with the new. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3930 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 22:37:18 +00:00
Jens Ayton
8bb9caad32 Switching to newjs as Mac OS X default. Out with the old (temporarily keeping it around for easy reference)... 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3929 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-30 22:35:57 +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
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
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
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
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
Eric Walch
d50a639d76 The file 'oolite-constrictor-pilot.js' was missing in the builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3855 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-17 10:36:20 +00:00
Jens Ayton
1242dfdd67 Work on JavaScript API update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3845 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-12-12 16:22:26 +00:00
Eric Walch
3c099b9a59 - Added AI command: thargonCheckMother for a more efficient thargon handling. 
- Improved the thargletAI slightly.
- Changed policeInterceptAI so that launching ships without target immediately clear the launch area.
- Moved the constrictor script from shipData to the worldScript. (to prevent problems with bad oxp copies of the constrictor)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3752 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-16 20:13:01 +00:00
Eric Walch
1eddd475cf restoring one line in trackDestination that gave problems with the player using docking computer 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3747 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-09-07 18:25:08 +00:00
Jens Ayton
6d4a55504a [Mac] screen shots directory can now be moved around (on the same volume). If it is renamed, Oolite deliberately ignores it and creates a new one on the desktop. The dock tile plug-in has not yet been updated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3672 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-07-15 13:15:12 +00:00
Jens Ayton
032813faac Updated Mac Ogg and Vorbis libraries. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3598 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-25 09:22:54 +00:00
Jens Ayton
32e1884e05 Groovy yet horrible macros to automate conversion of ObjC macros to JavaScript macros, and also profile individual native callbacks. More info in the Top Secret Mailing List Treehouse. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3586 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-21 18:07:47 +00:00
Jens Ayton
b2120abb35 Sorted some JS property and method declarations alphabetically to make checking their corresponding wiki pages easier. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3560 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-17 22:57:31 +00:00
Jens Ayton
794d5833b5 Removed obsolete bug notes from checklist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3546 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-15 17:59:17 +00:00
Jens Ayton
2265f75214 Disabled automatic build/install of dock tile plug-in for people building on Leopard. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3534 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:59:49 +00:00
Jens Ayton
30bece8f30 Moved Oolite-importer into Mac-specific. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3532 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:25:19 +00:00
Jens Ayton
3472aabce9 [Mac] Added dock tile menu to show log, screen shots etc. In Snow Leopard, it sticks around when the app quits if it's still in the dock. Also, option->show log shows the log folder. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3530 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-13 20:08:57 +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
Eric Walch
6acabb790f Moved "oolite-rocktunnel.dat" to the correct "Models" folder. Probably only wrong at the mac 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3489 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-09 18:34:21 +00:00
Jens Ayton
3cafc40ed8 Switched PlanetEntity over to OOTexture. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3460 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-04 15:25:08 +00:00
Jens Ayton
20da5ba016 Fix for PlanetEntity leaking display lists. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3452 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-06-03 19:17:43 +00:00
Jens Ayton
8a9a1e7b83 Added new debug function: console.writeMemoryStats(). Estimates total memory use by entities and textures, and how much texture data is visible (i.e. relevant to GPU swapping). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3434 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-30 14:51:13 +00:00
Jens Ayton
5f84c63462 Fixed some scaling and conversion bugs in OOCombinedEmissionMapGenerator. Mac DebugOXP New Ship menu item now works like :spawn macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3366 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-18 16:28:05 +00:00
Marc
15fcc13c8a - added new resource files to mac build 
- brought most copyright notices up to date.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3361 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-15 23:50:35 +00:00
Jens Ayton
a7cf62d05f Support for GPU-specific settings. Dust now works/isn't slow (depending on platform) on GMA9xx. Default shader mode is now FULL except on 9xx/GeForce 5200. Full shader mode is disabled on GMA9xx. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3339 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 12:45:10 +00:00
Jens Ayton
3de5adccc1 Centralized setting of GL_POINT_SMOOTH and GL_LINE_SMOOTH, since they're never deliberately disabled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3338 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-14 09:53:02 +00:00
Jens Ayton
46c40ec186 More graceful handling of disappearing docking target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3308 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 15:21:06 +00:00
Jens Ayton
423d317234 Resurrected Mac sound inspector (as part of Debug OXP). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3306 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-05-09 13:33:03 +00:00