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

797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
ed9660ad66 Updated Xcode project to include OOShaderUniformMethodType, added implementation note to OOShaderUniformMethodType.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1047 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-27 17:59:59 +00:00
Jens Ayton
45122c2250 Fix for shader uniform bindings under GNU Objective-C runtime. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1046 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-27 17:43:37 +00:00
Jens Ayton
630ad3c361 Removed redundant global 'debug' under SDL. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1045 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-26 22:13:30 +00:00
Nikos Barkas
c8650adb03 Make debug functionality a build option under Windows. Fix compilation error under GNUstep. Get Oolite to compile even when CHECK_ERROR_AT_EACH_STEP is not set to 1. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1044 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-26 21:43:42 +00:00
Jens Ayton
e9f415e686 Fix for witchspace config not being read. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1043 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-26 16:26:11 +00:00
Jens Ayton
8ee76e4f12 Keyconfig.plist is no longer cached. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1042 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-25 15:32:00 +00:00
Jens Ayton
8294158f5a Made planetinfo.plist entry for interstellar space less excitable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1041 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-24 21:53:59 +00:00
Jens Ayton
ed56abb58b Added check for max_version key in requires.plist. key_dump_target_state is now disabled by NDEBUG. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1040 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-24 21:37:48 +00:00
Jens Ayton
61060a31b4 Fiddled with OS X Debug menu. Global debug flag renamed gDebugFlags, only declared once, and disabled if NDEBUG is defined. Removed -[Universe removeWithoutRecyclingEntity:] (old method from the entity-recycling days). Switched back to old sky code until after 1.69. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1039 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-24 20:46:08 +00:00
Jens Ayton
eefee6c0b2 Stopped beating around the bush and fixed the docking bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1038 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-24 17:47:58 +00:00
Jens Ayton
c784759b3d Much fiddling while trying to track down docking bug, mostly focused on the wrong stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1037 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-23 23:20:19 +00:00
Dylan Smith
070b7057e7 fix Linux build breaks 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1035 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-20 22:01:35 +00:00
Jens Ayton
8aba5f1370 Fixed error reports for shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1034 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-17 17:00:19 +00:00
Jens Ayton
21aa6f983d Fixed occasional glitch in solar corona rendering; removed debug code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1033 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-17 14:15:36 +00:00
Jens Ayton
71d7a25468 Removed debug code from OOSkyDrawable, and made it use OOMacroOpenGL. Added code to help catch occasional drawing glitch with sun. Disabled pruning of on-disk cache completely; as we now clear the cache when OXP search paths change, its size is bounded by the total size of installed OXPs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1032 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-16 18:01:41 +00:00
Nikos Barkas
df2de704ed Get pollShiftKey to work as per specification under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1031 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-14 06:09:40 +00:00
Jens Ayton
187e58eb0c Fix for lots of 'file not found' messages under Windows. Updated README.txt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1030 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-12 08:43:59 +00:00
hikari
ba1c215ff6 Modifed Linux specific portions of the build rules. 
Added Ubuntu/Debian build glue.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1029 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 17:24:23 +00:00
Jens Ayton
f66bdbe40e Re-disabled ~/.Oolite/AddOns/ in Windows, and added a comment about why. :-) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1028 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 12:56:41 +00:00
Jens Ayton
bdc3cd9583 Removed obsolete, broken custom XML plist writer for saved games (hasn't been used for a while). Changed OOPListParsing.m to convert DTDs from Apple to GNUStep format on GNUstep, rather than on 'anything other than' GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1027 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 12:34:43 +00:00
Jens Ayton
05debfa3af Re-fixed-up search paths code for Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1026 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 12:23:52 +00:00
Jens Ayton
4550dd007d Fiddled with search paths. Should induce workingness in Linux, and add ~/.Oolite/AddOns support under Windows (people don't have to use it if they don't want to, which they won't, because GNUstep's idea of ~ under Windows is a tad peculiar). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1025 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 11:25:05 +00:00
Jens Ayton
9345ad2222 Further Linux-oriented GNUmakefile tweaks. Removed redundant Entity.actual_radius field (always same as Entity.collision_radius). Removed testing code from SkyEntity/OOSkyDrawable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1024 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-11 11:08:44 +00:00
Jens Ayton
24097ad053 Xcode project file tweak to make new version work without star/nebula texture OXP. Added JavaScript library to makefile for Linux. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1023 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-10 13:49:37 +00:00
Jens Ayton
5164b5f4a6 New sky-drawing code. Currently doesn't produce the same skies as the old code, but otherwise seems to work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1022 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-10 13:36:42 +00:00
Jens Ayton
2b5de35ef5 Changed back to calculating alertCondition on the fly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1021 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-10 11:43:14 +00:00
Nikos Barkas
e7c7b3d203 Ensure that all three lines of the savegame description text get erased properly when the text changes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1020 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-10 09:32:13 +00:00
Nikos Barkas
669b023e3c Unbreak the comms log key (SDL does not have an SDLK_ code of 126 (~)). Also fix a semicolon missing error from previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1019 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 15:34:25 +00:00
Jens Ayton
189bb5ac6a Fixed previous fix so it actually fixes stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1018 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 15:05:36 +00:00
Jens Ayton
5465c792a4 Fix for input not working under SDL. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1017 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 15:01:59 +00:00
Jens Ayton
5ac093d632 Fix for auto-docking, which is in fact four fixes. One, the player ship's AI is now set to the autodock AI, as it should be. Two, subentityRotationalVelocity is set up properly, rather than being left as the zero quaternion. Three, the situation in which a zero subentityRotationalVelocity could lead to a zero orientation has been fixed. Four, the PlayerEntity now recovers if its orientation is set to the zero quaternion (by resetting it to the identity quaternion). Also fiddled some more with the Mac debug menu. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1016 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 13:33:25 +00:00
Jens Ayton
5f5c7af724 Modified conversion handling in shader uniforms to match documentation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1015 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 12:17:18 +00:00
Jens Ayton
9a450d5f10 Cleaned up GameController, putting most platform-specific stuff in two major blocks. Mac-specific: Help window contents now loaded from (copy of) ReadMe.rtfd to ensure it's up-to-date; added log message format prefs window to Debug menu. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1014 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 10:38:16 +00:00
Nikos Barkas
b047c76b40 Fix legal status not displaying. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1013 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-09 08:54:16 +00:00
Jens Ayton
741f48d34a Undid damage to shipdata.plist from last revision. Extended dummy joystick handler for OS X to reduce the number of #ifs in PlayerEntityControls.m. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1012 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-08 14:54:21 +00:00
Jens Ayton
9137ef4581 Clean-up of various methods in connection with documenting uniform binding mechanism. Tweak to syntax for said mechanism. Bumped version number to 1.69. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1011 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-08 12:59:08 +00:00
Nikos Barkas
6bf2e24b09 Improved hopefully a bit SDL keyboard input handling. Oolite can now recognize '#', '^', etc. as valid keypresses. In SDL windowed mode, window caption indicates version and date the executable was compiled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1010 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-08 06:56:15 +00:00
Nikos Barkas
3a0dd63ad0 Added glUniform2fvARB to the OGL extensions list under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1009 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-06 14:14:16 +00:00
Jens Ayton
54e3c4946d Fix for problem with reading cache in GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1008 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-06 13:21:10 +00:00
Jens Ayton
c5bdafd0cf Moved Mac-specific debug nib thing around. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1006 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-06 12:08:26 +00:00
Jens Ayton
3dc82d26cd Tweaks for shader bindings; added Clear All Caches menu item to Mac Debug menu. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1005 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-06 12:02:40 +00:00
Jens Ayton
f746a728e6 Unbroke last revision. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1004 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-06 09:12:35 +00:00
Jens Ayton
3da0adce22 Unbroke sky entity (accidentally checked in partial rewrite in last commit). This also fixes some efficiency issues in the old implementation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1003 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-05 11:53:11 +00:00
Jens Ayton
28452cac1e Rearranged cache manager so only platform-specific stuff is in the platform-specific category. Also changed GNUstep cache path, this time in an unbroken way. Yes, this is intentional. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1002 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-05 11:50:56 +00:00
Jens Ayton
0288845564 Probable fix for mesh cache problem. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1001 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-05 11:40:14 +00:00
Jens Ayton
2edf174248 Cleaned up and commented mesh cache generation code as first step in debugging. Not really exciting enough to be revision 1000. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1000 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-05 10:46:28 +00:00
Jens Ayton
beedfd7d98 Additional OOCacheManager debug code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@999 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-04 16:30:31 +00:00
Nikos Barkas
71d17f4c09 Fix cache path generation under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@998 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-03 18:57:29 +00:00
Nikos Barkas
0084255b79 Fix gameView related startup problem under GNUstep. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@997 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-03 17:06:05 +00:00
Jens Ayton
44a5a3e981 Possible (but unlikely) fix for sky bugs under Windows. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@996 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-03 11:15:13 +00:00