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

916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
949cd8da04 Load screen now uses file extensions (urgh) to recognize saved games rather than trying to parse every file as a plist. Fixed display of giant question mark for unknown ship types (but it draws in the wrong place in wide windows, which probably also affects long ships). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1069 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-09 14:58:33 +00:00
Jens Ayton
8a85b1a657 Fixed crash when shooting off frangible subentities. Added notequal operator for legacy scripts. Removed unused enumerant GUI_SCREEN_INVENTORY. Added logging-echo-to-stderr option (OS X only) and changed default for logging-show-app-name to NO on OS X (was already NO for other platforms). Scripts no longer run when paused and on a menu screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1068 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-08 22:47:30 +00:00
Jens Ayton
b81b118146 Log messages now go to a file (~/Library/Logs/org.aegidian.oolite/Latest.log) under OS X. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1067 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-08 13:01:09 +00:00
Jens Ayton
32880688f0 Reduced player ship trade-in values by a blanket 75% in an attempt to stop the earning-money-by-buying-similar-ships-repeatedly exploit. This is insufficient! It's still possible to make money this way in some cases. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1066 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-08 09:27:09 +00:00
Jens Ayton
bfc5cae918 Broke queue mechanism out of OOTextureLoader into separate class, partly for neatness and partly because I need it for something else. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1065 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-08 09:04:43 +00:00
Jens Ayton
b7f50b454c Fixed bug in fix to dockEscorts bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1064 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-07 19:45:53 +00:00
Jens Ayton
b3b04859ab Enabled more warning flags (-Wextra -Wno-unused-parameter -Wno-missing-field-initializers) in OS X build, and fixed several hundred resulting warnings (mostly by using more appropriate types). Bumped version number to 1.69.1. Fixed unable-to-buy-in-shipyard bug. Attempt to fix dockEscorts crash bugs (needs testing). Sundry cleanup, especially of AI and GuiDisplayGen; all exception throws now in standard form. Removed some dead code. Use correct key for Advanced Nav Array if no keyconfig.plist found. Changed OOCollectionExtractors to always clamp integer values to the requested type's range rather than truncating like NSNumber. Removed inconsistently-used and apparently-unneeded NSLock from AI. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1063 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-07 15:44:50 +00:00
Jens Ayton
8a673c223e Undid previous revision, which was based on faulty implementation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1062 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-06 15:16:36 +00:00
Jens Ayton
81eec06aea Changed texture 'type' parameter under Windows to something apparently more optimal. Needs testing -- are colours right? Is performance noticably changed? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1061 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-06 11:01:14 +00:00
Jens Ayton
f0b1addbeb Fixed legacy script method awardCredits: always setting the player's balance to 0. Fixed JS script method system.legacyAddShipsWithinRadius() ignoring radius parameter. Made JS methods that use legacy script methods always set the legacy script system script target to ensure consistent behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1059 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-04 12:12:58 +00:00
Nikos Barkas
edd19a72ff Fix for the awardCredits bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1058 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-04 11:37:55 +00:00
Nikos Barkas
6fd8ba7ee2 Fix (lack of) death_actions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1057 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-03 06:12:58 +00:00
Jens Ayton
99beca0c17 Fixed texture scaling bug (it was failing to provide space for mip-maps when the texture scaler had only shrunk a texture). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1054 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-01 09:42:45 +00:00
Jens Ayton
1b2f4b2117 Changed crashing bug in scaler into non-crashing bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1053 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-07-01 00:38:51 +00:00
Jens Ayton
c2adbdc25e Fixed a crashing bug in texture scaler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1052 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-30 23:58:50 +00:00
Nikos Barkas
aff0c98dd6 Re-enabled the -fullscreen command line option that did not seem to do anything at all, at least under Windows. Updated Oolite-Readme.txt with the Wiki location for OXP downloads. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1051 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-29 16:44:23 +00:00
Jens Ayton
439d26be98 Fixed problem with traders that have pirate AI. Gave each non-player ship a unique role based on its dictionary key. Changed numbers like 0.65000000000000002 to 0.65. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1050 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-29 12:55:48 +00:00
Jens Ayton
72f760b4d6 Updated shader uniform declaration syntax to match documentation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1049 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-29 11:38:50 +00:00
Jens Ayton
59a5b197e0 Disabled extra bug checking in SkyEntity. Disabled build of OOSkyDrawable (both for Xcode and GNUmakefile). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1048 127b21dd-08f5-0310-b4b7-95ae10353056
 2007-06-28 10:33:19 +00:00
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