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 |
|
Jens Ayton
|
5572ddab50
|
Cache path should now be created properly under GNUstep, and XML should be used for cache (should change to GNUstep binary format once bugs are resolved). Added lots of debug messages to cache.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@995 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-06-03 09:32:06 +00:00 |
|
Jens Ayton
|
0382795518
|
Added support for flushing data cache by holding down shift at startup (needs testing under SDL!). Also, a question mark is now shown as a placeholder model on the Load screen if a saved game uses an unknown ship class.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@994 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-06-02 20:58:41 +00:00 |
|
Jens Ayton
|
22c0e0cae4
|
Save display name of ship in saved game files to help identify missing OXPs. Updated metadata indexer to use this information. Partial cleanup of load/save and loading screen code (use of OOCollectionExtractors, stuff moved to OOConstToString, new DESC macro to get descriptions from [UNIVERSE descriptions] (by analogy to NSLocalizedString).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@993 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-06-02 16:19:58 +00:00 |
|
Jens Ayton
|
da8faba50e
|
Retain textures in SkyEntity. Fixed some (but not all) user escape pod problems.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@992 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-25 14:46:32 +00:00 |
|
Jens Ayton
|
64b49edc08
|
Further modified SkyEntity.m for bug tracking.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@991 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-25 13:40:22 +00:00 |
|
Jens Ayton
|
628d4c6253
|
Added error-checking code to each GL call in SkyEntity to help track down a Windows bug.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@990 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-25 12:47:00 +00:00 |
|
Jens Ayton
|
28855f728e
|
Non-sucky fix for problem plists, hopefully.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@989 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-24 10:01:41 +00:00 |
|
Nikos Barkas
|
0a1560d670
|
Added libpng headers to project. Added OOGraphicsResetManager.m to GNUstep makefile. Oolite for Windows should now compile out of the box.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@988 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-24 07:39:44 +00:00 |
|
Jens Ayton
|
5839182b7d
|
OOTextureified trumbles.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@987 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 15:19:56 +00:00 |
|
Jens Ayton
|
8064f60033
|
Sky and particles now survive graphics reset (trumbles probably don't). Added Create Ship... to Mac Debug menu.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@986 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 14:58:53 +00:00 |
|
Jens Ayton
|
8ed1b9af6e
|
Fiddled with Mac debug menu (added in previous commit).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@985 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 14:24:12 +00:00 |
|
Jens Ayton
|
786e73fcbb
|
Work on reimplementing texture reloading -- works for shipentities and text, not sky and particles.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@984 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 13:12:13 +00:00 |
|
Jens Ayton
|
cd95fef015
|
Fixed OOOpenGLExtenssionManager issues: Windows function pointers only defined once, locking reintroduced, correctly this time. Also removed some unused function pointers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@983 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 11:04:19 +00:00 |
|
Nikos Barkas
|
ecd3f5fe01
|
Eliminate a few more compile errors on Windows. Add a more recent JavaScript API. Add import library for libpng.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@981 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-23 10:31:16 +00:00 |
|
Nikos Barkas
|
d83c471c78
|
Determine number of CPUs under Windows. Add missing OGL extension function names. Temporarily disabled OOBadOpenGLExtensionUsed in order to get it to link under Windows. Testing and/or permanent fix will be needed.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@980 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-22 12:16:01 +00:00 |
|
Jens Ayton
|
8dfcfa9b58
|
XMLified problem plists.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@979 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-21 17:15:07 +00:00 |
|
Nikos Barkas
|
6ae1f90c10
|
Updated GNUstep makefile so that Oolite compiles and links on Windows.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@978 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-21 14:04:22 +00:00 |
|
Nikos Barkas
|
0a3c5fcf79
|
Fixed damaged equipment displayin incorrectly on non 4:3 screen resolutions.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@977 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-21 07:41:18 +00:00 |
|
Jens Ayton
|
55f832da66
|
Moved some OpenGL utilities into OOOpenGL.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@976 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 15:13:22 +00:00 |
|
Jens Ayton
|
97f91f6a18
|
Two potential crashing bugs, two potential graphical glitches, and one actual crashing bug.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@975 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 14:38:13 +00:00 |
|
Jens Ayton
|
269a68f56d
|
Oops, forgot to add planetinfo.plist (needed for data-driven witchspace).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@974 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 13:44:00 +00:00 |
|
Jens Ayton
|
d4c648d4dd
|
Made SkyEntity a subclass of Entity rather than OOSelfDrawingEntity, thus removing a bunch of mesh stuff it wasn't actually using. Researched GL_APPLE_vertex_array_object, worked out that it wasn't doing anything useful in Oolite, stripped it out, and saw a frame rate increase of 2/3.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@973 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-20 13:36:03 +00:00 |
|
Jens Ayton
|
4bf02adaf9
|
Reinstated caching of ship meshes.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@972 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 23:19:45 +00:00 |
|
Jens Ayton
|
41399eeec4
|
Typo.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@971 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 22:25:53 +00:00 |
|
Jens Ayton
|
0de5f00261
|
Changed internal structure of OOMesh to simplify caching. Raised vertex and face limits. Deprecated front_metal.png texture.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@970 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 22:18:22 +00:00 |
|
Jens Ayton
|
53b4821191
|
Trimmed another unused SkyEntity method.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@969 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 15:10:38 +00:00 |
|
Jens Ayton
|
17e40ba6c7
|
Lots of fiddling around, most of it reverted. Meh. New shinier (and simpler) sky.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@968 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-19 15:09:05 +00:00 |
|
Jens Ayton
|
3c4929873f
|
Made fallback material data-driven, for great justice.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@967 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-14 16:39:21 +00:00 |
|
Jens Ayton
|
6643d24da1
|
Implemented garish placeholder texture for meshes with no TEXTURES section. Fixed bug where StationEntites were not being initialized fully. Made tharglets unpiloted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@966 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-14 15:54:13 +00:00 |
|
Jens Ayton
|
a1597b4e6b
|
Changed sky to use additive blending; converted galaxy and star textures to one channel and adjusted black points.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@965 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 15:29:13 +00:00 |
|
Jens Ayton
|
dfbaee641c
|
Removed code to use mipmap scalers when rescaling arbitrarily, because a) it's not very useful since I went with box filtering and b) it didn't work.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@964 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 14:14:38 +00:00 |
|
Jens Ayton
|
25a46d911b
|
Texture scaling library complete.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@963 127b21dd-08f5-0310-b4b7-95ae10353056
|
2007-05-13 14:06:49 +00:00 |
|