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

173 Commits

Author SHA1 Message Date
Jens Ayton
15795b03f2 Simplified key loading code, added 'dump target state' key (not bound to anything by default). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@917 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 21:06:29 +00:00
Jens Ayton
b06cee52f7 Clean-up of ship loading (not finished). Allow arbitraryish laser colours. Explosions toned down somewhat for really big ships. Fixed bug where ships which could have a shield enhancer, but don't, get some of the benefit of one. Increased intensity of exhaust plumes slightly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@915 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-08 14:31:35 +00:00
Jens Ayton
a86bb97788 Subentities now share properties with parent for purposes of shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@913 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-07 20:49:06 +00:00
Jens Ayton
ca593a0a1e Error reporting for JS Vector and Entity methods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@911 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-06 17:35:42 +00:00
Jens Ayton
a2f6fea6a3 Removed a spurious error message. Removed debugOn/debugOff pairs from shipdata.plist and PlayerEntity.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@900 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 18:43:53 +00:00
Jens Ayton
8a55bc63a2 Xcode project tweak. Moved script out into Scripts folder (preparation for JavaScript translations). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@898 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 17:37:40 +00:00
Jens Ayton
046a2a4ff3 Renamed all built-in world scripts to start with oolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@893 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-02 21:04:35 +00:00
Jens Ayton
d327cb7b38 Fiddled with JavaScript loading and error reporting: unicode savvy, should load on all platforms. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@891 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-02 19:59:43 +00:00
Jens Ayton
7db1aebda6 Added some missingg JS methods; added systemEconomy_string; implemented willLaunch() event. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@887 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-01 16:56:17 +00:00
Jens Ayton
3fe9c74267 Lots of changes, mostly JavaScript-related. Bumped version number to 1.68. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@877 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-01 11:26:35 +00:00
Jens Ayton
05e5a0282f Hack to change Apple plist DTD to GNUstep plist DTD at runtime for XML plists. Added license clarification to OOFastArithmetic.m. Updated year in startup copyright message. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@876 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-30 12:19:21 +00:00
Jens Ayton
4a3acfe57d Synchronized logcontrol.plist.xml. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@874 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-28 06:05:02 +00:00
dajt
8abed6fe8c Fixed GNUstep resource paths, and ensuring XML logcontrol.plist is used for GNUstep installations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@873 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-28 02:16:03 +00:00
Jens Ayton
6345c35592 This week's monster submit: 
* Changed required.plist version parsing to treat version strings as series of integers separated by points. This allows:
  - correct parsing of bug-fix versions like 1.67.1
  - correctly sorting 1.100 after 1.99.
* Deleted just about all commented-out NSLog()s (several hundred), and some other commented-out code. (commented-out or #ifdefed-out code with no indication of when you might want to reinstate it is worse than useless.)
* Ensured that most NSLog()s will at least include their class/module in their message class.
* Renamed Universe's -recycledOrNew:, -getShipWithRole: and -getShip: to -allocRecycledOrNewEntity:, -newShipWithRole: and -newShipWithName: to better match Objective-C coding conventions. (Methods whose result needs releasing should always be called alloc*, copy*, retain* or new*.)
* Replaced -[Universe generateSystemDescription] with DescriptionForSystem().
* Replaced -[Universe getRandomDigrams] with RandomDigrams().
* Replaced +[Universe systemSeedString] with StringFromRandomSeed().
* Replaced [Universe entityZero] with [PlayerEntity sharedPlayer].
* Replaced scriptedUniverse in ScriptEngine with [Universe sharedUniverse].
* Removed HAVE_SOUND. If you're porting to a platform without sound, use a no-op implementation of OOSound.
* Removed all (commented-out) NSBeep()s.
* Made settings caching in OOLog actually work. Doing complete message class setting resolution every time OOLog() was called was around 2% of our per-frame cost. (With this fixed, cache hit rate is well over 99% after a few seconds of play.) *headdesk*  (It may also be worth moving the settings-check into the macro, to avoid evaluating parameters for log messages that are never seen, but this might cause obscure bugs due to the parameters having side effects.)

Stuff that should have been in revision 859:
* Replaced all occurrences of -[Universe expandDescription:forSystem:]  with ExpandDescriptionForSeed() and ExpandDescriptionForCurrentSystem().
* Replaced  -[Universe expandDescriptionWithLocals:forSystem:withLocalVariables:] with ExpandDescriptionsWithLocalsForSystemSeed() and ExpandDescriptionsWithLocalsForCurrentSystem().


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@872 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-26 01:24:50 +00:00
Jens Ayton
b30d3692cf Support loading of shaders from external file. New uniform variable, hull_heat_level. Fixed leak when shader loading fails. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@867 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-22 20:33:04 +00:00
Jens Ayton
93374ac533 Resurrected homebrew XML parser (now in OOPListParsing.m rather than ResourceManager.m). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@863 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-21 11:40:43 +00:00
Jens Ayton
d2914c3afb Moved property list reading (with error checking) into OOPListParsing.h/m. Build without warnings under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@862 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-20 17:12:39 +00:00
Jens Ayton
31c5de5763 Bumped version number. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@850 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-11 14:07:34 +00:00
Jens Ayton
eda894e7dc Possibly fixed mouse control bug under OS X. Or not. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@849 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-11 13:09:28 +00:00
Jens Ayton
34aa44d687 Mac-only sound fixes: hopefully fixed streaming sound stop crash -- the conditions for it don't seem to manifest on my single-processor system. Removed last instances of Objective-C method calls in real-time sound rendering thread \(mmm, crunchy IMP caching\). Added force_streaming_sound preference for debugging purposes. Fixed buffer size calculation and tweaked threshold for using streaming sound -- sounds larger than 1 MB \(uncompressed\) will now be streamed, rather than 16 MB for stereo and 8 MB for mono. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@843 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-10 16:08:37 +00:00
Jens Ayton
e03b0918fb Cache is now rebuilt if search paths or modification dates have changed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@842 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-09 18:41:57 +00:00
Jens Ayton
dfb2cafe63 Added high-level documentation of OOCache. Disabled cache integrity checking (OOCACHE_PERFORM_INTEGRITY_CHECKS macro). Avoid re-writing unmodified cache. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@841 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-09 17:07:46 +00:00
Jens Ayton
ec55398a9d Broke cache out into separate OOCacheManager class. Moved cache (under OS X) to ~/Library/Caches/org.aegidian.oolite/Data Cache.plist. Use binary plist format (on OS X) for cache. Detect byte sex mismatch in cache handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@831 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 23:50:32 +00:00
Jens Ayton
abe53df44f Yaw control working on OS X; disabled in strict mode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@830 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 18:40:34 +00:00
Jens Ayton
ece83a5097 Made Advanced Navigational Array available_to_all. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@829 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 16:39:58 +00:00
Jens Ayton
b97023eb63 Added more spiff to spiffy log system (code was expecting config file to be in the wrong place). OOLoggified GLSL setup. Re-rejiggered Xcode project -- now puts stuff in the right folders _and_ notices when files change. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@826 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-06 02:05:45 +00:00
Jens Ayton
0214517dd8 Found a version number and copyright string I'd forgotten to update. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@821 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 14:44:56 +00:00
Jens Ayton
46508e662b More OOLogification. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@819 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 14:34:26 +00:00
Jens Ayton
89a8501491 Added Advanced Navigational Array code by another_commander. Stopped saving textured planet flag in save files as it's experimental and, er, in need of further performance optimization. (Should be saved in preferences rather than game files anyway.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@818 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 13:19:11 +00:00
Jens Ayton
631971078a Converted much of PlayerEntityScripting to OOLog(). Replaced DEBUG_SCRIPT with flexible OOLogging metaclass goodness. Added OOLogIndentIf()/OOLogOutdentIf(). Fixed some bugs in OOLogging. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@817 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-04 19:01:58 +00:00
Jens Ayton
c0019d4048 Fixed up Xcode build process to build and embed Spotlight metadata importer. Also did the copyright notice dance in metadata importer source. Cleaned up group paths in Xcode project. Unbroke deployment build. Wished I had more computers to run distributed builds on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@815 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-04 14:05:05 +00:00
Jens Ayton
f8c5158df1 More OOLog stuff. Reduced use of ObjC message calls in sound pseudo-RT thread (could potentially cause lockups, apparently) -- should look into C implementation of VirtualRingBuffer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@814 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-04 13:30:09 +00:00
Jens Ayton
768b1c75ab Added oolog command line tool to manipulate OOLogging settings. Moved bits of OOCASound over to OOLog. Hijacked NSLog to call OOLog(@"unclassified", foo) instead. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@813 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-04 12:35:25 +00:00
Jens Ayton
ba718f3b70 Import OOLogging from OOCocoa.h. Rearranged logcontrol.plist. Changed to camelCase for both message classes and metaclasses. Added ability to override an explicit logcontrol.plist setting with 'inherit'. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@812 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-04 11:22:06 +00:00
Jens Ayton
1c6dfae3e2 Sexed up OOLogging with metaclass system and locking. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@811 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-03 19:05:50 +00:00
Jens Ayton
bb28b341c1 Moved more messages over to OOLogging, moved most log message classes into the relevant files rather than OOLogging.h to reduce recompiling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@810 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-03 16:07:19 +00:00
Jens Ayton
73e9925e1f Converted a number of verbose log messages to use OOLog. Changed default of logging-show-class to YES. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@809 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-03 15:40:23 +00:00
Jens Ayton
f3d32ecfa4 Added OOLog(), a replacement for NSLog(). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@804 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-02 21:20:18 +00:00
dajt
17761e7797 Added yaw control. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@773 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-01-21 10:26:30 +00:00
Giles Williams
91320d4db4 tweaks to planet textures - planet-shader removed 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@739 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-21 19:02:44 +00:00
Giles Williams
9d7c7cf11f more work on planet textures and shaders 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@734 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-18 23:42:55 +00:00
Giles Williams
fea49faba7 fix clash between Nova and Trumbles 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@731 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-18 08:57:20 +00:00
Giles Williams
c555de8a1e fixed escape pod flashers 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@725 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-08-12 08:04:50 +00:00
Giles Williams
e1edd7c6a6 WIP on new-style brains (instincts+AI) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@669 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-24 16:09:04 +00:00
Giles Williams
8f700ab576 bump version number 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@666 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-18 17:13:04 +00:00
Giles Williams
5242fcafab fixed external view numbering 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@665 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-18 17:11:54 +00:00
Giles Williams
c21dd5fccd accept a string as a keyconfig.plist value - setting the required key to the first character in the string 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@647 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-09 19:12:21 +00:00
Giles Williams
b680d2a359 adding wreckage to further prettify explosions 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@642 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-07 10:55:28 +00:00
Giles Williams
53b06c8332 max speed through ring now recommended 225 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@634 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-05 13:21:20 +00:00
Giles Williams
dc0c91e70f custom views for each player ship 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@632 127b21dd-08f5-0310-b4b7-95ae10353056
 2006-07-05 13:08:29 +00:00