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

82 Commits

Author SHA1 Message Date
Jens Ayton
bdbe1b72ff New texture code (for models with shaders only). Somewhat buggy (notably, player ship is untextured after dying and respawning) but seems stable. Also removed a spurious assert from sound code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@929 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-14 00:07:32 +00:00
Jens Ayton
c66ebf27a0 Held Xcode's hand through the painful journey of discovering that changing where header files are means they're not in the sampe place any more. *muttermutterstupidpieceof...* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@927 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 11:24:04 +00:00
Jens Ayton
d7f84cb164 Moved some files around a little bit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@926 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 10:49:46 +00:00
Jens Ayton
9ead245895 Fixed code using for (i = 0; i != [[foo allKeys] count]; i++) antipattern. Cleanup of player saving: uses proper way of getting an XML property list (which is cross-platform), better error messages, less code duplication. Added Edit menu to OS X version, for use in dialog boxes. Bits of new texture model, but they're not used yet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@925 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-13 10:38:08 +00:00
Jens Ayton
73aafb43e1 Rewrite of shader code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@923 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-11 20:29:30 +00:00
Jens Ayton
e1d5ba7272 Tweaked key loading -- strings like "09" now get treated as numbers, even though "9" is treated as a string. Remade default keyconfig file - now has all current keys and is easier to read. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@922 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-10 09:33:41 +00:00
Jens Ayton
3aa4cab9c4 Moved station-specific collision logic into StationEntity. (Working on unifying player and NPC damage models and moving shields into ShipEntity.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@920 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-09 15:40:02 +00:00
Jens Ayton
c611e69a33 Implemented JavaScript quaternion. Much cleanup. Made various enumerations actual enum types. Made some other integer types dedicated types. Slightly reduced size of entity instances. Relatively high chance of breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@912 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-07 18:03:50 +00:00
Jens Ayton
67138687af implemented JS Entity class (but not tested - there's no way to get an entity yet). Simplified JS Vector by removing the reference-to-object-property stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@910 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-06 15:09:19 +00:00
Jens Ayton
cc175c75b9 Changed references to PlayerEntityScripting to PlayerEntityLegacyScriptEngine. Cleanup of Entity.h led to making universe a global (UNIVERSE) because having lots of references to it and passing it around is silly, and it's used many thousand times per frame. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@906 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-05 16:46:46 +00:00
Jens Ayton
fb8a955819 Check for exceptions at startup even for non-Macs. Stop copying SoundInspector.nib on Macs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@901 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 21:08:34 +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
aab442c1d3 Fixed crashes at startup due to stale references to system data. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@897 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 17:23:13 +00:00
Jens Ayton
0f356d5154 OOLogging now merges logcontrol.plist from the root search paths. This is hopefully the last touch on 1.68-mac. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@896 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-03 00:14:21 +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
1a18ca735e More scripting tweaks. Moved all of universe into system, and removed universe. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@888 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-01 18:41:47 +00:00
Jens Ayton
5c9352dab4 Moving and renaming scripting files, step 4 of 3 (was in wrong directory). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@885 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-04-01 15:11:22 +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
33c4052af8 Shader tweaks, builds without warning on Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@875 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-28 18:24:31 +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
0cdc0f3a35 Changed OOCacheManager's endian tag mechanism to actually do something useful - serious brain fart there. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@870 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-25 18:56:29 +00:00
Jens Ayton
074ba280ab Tweaks to shader handling. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@869 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-25 01:56:12 +00:00
Jens Ayton
0ddae7d767 Split texture scaling into separate file, mostly to be able to apply optimization flags. Added some maths functions I had lying around. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@864 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-21 19:32:27 +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
45aa08c6c8 Start of bottom-up merge of changes made as a result of script refactoring 
(mostly knock-on effects):
* Split vector.h/c into OOMaths.h and several implementation files.
  Moved more of the functionality into inlines.
  Use GCC attributes for better optimization.
* Moved various string parsing methods into functions (in
  OOStringParsing.h/m).
* Deleted custom XML plist parser which dajt said we no longer need. Turns
  out several OXPS depend on its more lenient parsing. Will re-integrate
  as separate module rather than as methods on ResourceManager.
* Reduced header file interdependencies. entities.h is now deprecated.
* Various minor clean-ups.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@859 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-20 01:40:09 +00:00
Jens Ayton
64f80b08cb Merged in JavaScript branch, but haven't got it to do anything yet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@852 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-11 17:41:38 +00:00
Jens Ayton
d55d020000 Made OS X deployment build build with no warnings. Fixed problem with previous bug fix to streaming audio. Stayed up way too late. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@845 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-11 02:14:12 +00:00
Jens Ayton
c9707576f8 Split OOCache off into separate class. Currently trivial, but I'm about to rewrite it from scratch. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@837 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-07 16:15:04 +00:00
Jens Ayton
2e19031d89 Unified implementation of pollFlightArrowKeyControls: -- one less #ifndef. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@832 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-07 00:28:55 +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
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
199b6fd004 Fiddled with build process again - now it runs properly from outside of Xcode. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@824 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 16:41:12 +00:00
Jens Ayton
82e3e25027 Further improved Mac build process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@822 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 14:58:51 +00:00
Jens Ayton
4358294d92 Removed project file references to in-progress stuff, squashed a spurious uninitialized variable warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@820 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-05 14:42:46 +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
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
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
Jens Ayton
a8d25204fc Updated license terms in documentation. Added GPL.TXT. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@803 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-03-02 16:14:49 +00:00
Jens Ayton
2f584a4b4f Cleaned up Xcode project file hierarchy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@797 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 23:00:50 +00:00
Jens Ayton
a3e6c2401a Renamed ScannerExtension.* to NSScannerOOExtensions.* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@794 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 21:27:09 +00:00
Jens Ayton
374b59c209 Renamed PlayerEntityAdditions.* to PlayerEntityScripting.* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@792 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 21:14:52 +00:00
Jens Ayton
78b8c11810 Like revision 789, but with a slightly higher number. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@791 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 21:12:47 +00:00
Jens Ayton
c14057f135 Renamed OOFileManager.* to NSFileManagerOOExtensions.* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@790 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 20:51:17 +00:00
Jens Ayton
8e571c3f17 More fun with license headers. Also, fixed all build warnings under Xcode, deleted redundant OOSoundSource.h (use OOSound.h) and repainted the kitchen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@788 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 20:40:09 +00:00
Jens Ayton
745b9ae762 Renamed MutableDictionaryExtension.* to NSMutableDictionaryOOExtensions.* 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@786 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 18:39:03 +00:00
Jens Ayton
5f87a57289 Changed LoadSave.* to PlayerEntityLoadSave.* for consistency. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@783 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-28 14:38:21 +00:00
Jens Ayton
6c3b3b72ce Made Oolite build under OS X (with several undeclared selector warnings in ShipEntity.h). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@780 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-02-25 16:05:30 +00:00