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

1730 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikos Barkas
39c54d0d88 Some optimizations, especially regarding procedural textures generation for planets. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2001 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-16 17:23:09 +00:00
Jens Ayton
f932b28dc7 Fixed severe Jens-being-an-idiot bug in r1998. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1999 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-16 09:55:28 +00:00
Jens Ayton
164fd3f2e9 Implemented whitelisting for legacy script conditions, and accidentally optimized evaluation while at it. Conditions for world scripts are currently sanitized (i.e. whitelisted, aliases resolved, syntax checked and partially tokenized) on the fly; this will be cached once sanitizing is implemented for actions. Deleted unused class OOLegacyEventHandlerScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1998 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-16 01:24:01 +00:00
Jens Ayton
7e258819b9 Implemented shader uniform binding whitelisting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1997 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-13 08:51:46 +00:00
Jens Ayton
3997e2c835 Merged -[ShipEntity nearestPlanet] and -[ShipEntity nearestLargeBody]. Cleanup. Added uniform bindings to whitelist.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1996 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 19:47:11 +00:00
Jens Ayton
7c2ab9b595 It's a good idea to save everything before checking in. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1995 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:32:43 +00:00
Jens Ayton
46c7fef016 Whitelist fixes based on forum suggestions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1994 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:19:27 +00:00
Jens Ayton
b02f108735 Implemented AI validation OXP verifier stage. Removed invalid and unused shuttleAI.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1993 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-12 18:04:02 +00:00
Jens Ayton
3b1db9072d Work towards securing legacy scripts, AIs and shader uniform bindings by whitelisting methods. Game will now print an error message if non-whitelisted methods are used in AIs; in 1.74, this will be changed to dropping non-whitelisted commands from AI actions. My intention is to have similiar mechanisms in place for scripts and uniform bindings by 1.73 release. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1991 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-11 15:53:01 +00:00
cmdrjames
f9c45d3323 Fix for: [ Bug #14011 ] Carriers should have groupID set. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1990 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-11 15:20:01 +00:00
Nikos Barkas
b2e61962a7 Fixed defense police ships launching with wrong AI (bug #015037). Changed NPCShipLaunchedFromStation handler name to stationLaunchedShip. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1986 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-11 14:07:34 +00:00
Nikos Barkas
ca6972e025 Fixed a bug where role probability sets were getting corrupted during creation of mutable copies of themselves, under certain conditions. Fixes the particularly annoying bug of the missing buoys. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1983 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-09 07:10:47 +00:00
Nikos Barkas
cab167d520 Added the station script event handler NPCShipLaunchedFromStation. Changed the primary role of pirate ships launched from stations to defense_ship. Both as per Eric's recommendations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1982 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-08 13:08:03 +00:00
cmdrjames
fea4c08750 q-mines are now more selective in what they cascade 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1981 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-08 00:07:07 +00:00
Jens Ayton
09e44b5f9c Missing files. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1979 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:51:58 +00:00
Jens Ayton
14e48aad0e Removed unused port_radius attributes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1978 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:49:45 +00:00
Jens Ayton
c434cb64f1 Implemented AI method scanForNearestShipMatchingPredicate:. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1977 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-07 23:27:49 +00:00
Nikos Barkas
7ff394ceaf Slightly improved language for the processor count log header message on the SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1975 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-06 17:26:28 +00:00
Jens Ayton
32f0e10996 Rearranged ship registry verification stages so _overrides are applied early and subentities are tagged before bad entries (which may own subentities) start being culled. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1974 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-06 16:10:44 +00:00
Jens Ayton
81fc966691 Slightly better error messages when addShips*: fail. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1973 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-05 20:44:22 +00:00
Jens Ayton
8f0900ea10 Fixed uninitialized variable warning from r1955/1966. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1972 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-05 17:03:41 +00:00
Nikos Barkas
4fccd38034 Upgraded libpng on Windows to version 1.2.34 in an attempt to deal with the corrupt textures issue on multiple loading threads. Enabled use of all available processors for texture loading threads. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1966 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-04 15:45:01 +00:00
Jens Ayton
0319297410 Fix for AI restart in policeInterceptAI as per http://aegidian.org/bb/viewtopic.php?p=65011#65011 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1964 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-04 00:45:24 +00:00
Nikos Barkas
3b25f17ff7 Fixed some problems in the equip ship screen (not redrawing screen upon equipment buy and description for fuel shown for all items). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1961 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-03 17:40:10 +00:00
Jens Ayton
5456372c05 Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1960 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-03 14:19:44 +00:00
Jens Ayton
8270380c53 Tiny tweaks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1959 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-03 00:07:05 +00:00
cmdrjames
b85e28c1a6 Add docked shipyard tech level condition functionality: 
<key>conditions</key>
<array>
<string>dockedTechLevel_number lessthan 11</string>
</array> 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1958 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-02 22:17:01 +00:00
Jens Ayton
a1470f5b9c Pegged texture loading thread count to 4 in hopes of seeing texture corruption issues. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1957 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-02 01:20:49 +00:00
cmdrjames
e8b0593101 take the swich/case default back out so that the compiler tells us if we miss a case 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1956 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-01 22:11:46 +00:00
cmdrjames
5260ef0ed6 Mostly cosmetic changes while looking into bug list. Code is now slightly easier to read, and a couple of very slight improvements, such as adding defaults to a switch/case 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1955 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-01 21:31:11 +00:00
Nikos Barkas
c910d93bc9 Fixed a syntax error in the Cloaking Device mission script. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1952 127b21dd-08f5-0310-b4b7-95ae10353056
 2009-01-01 17:20:54 +00:00
Jens Ayton
ced2067f48 Bad flasher definitions, and bad subentity definitions for frangible ships, no longer stop a ship from loading. Fixes to suppress spuripous warnings from clang static analyzer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1945 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-31 15:45:49 +00:00
Nikos Barkas
57454f9d6f Fixed a bug where by flooding the market when selling a ship, cargo remained on the newly acquired ship even if said ship had no cargo carry capability. Now, all cargo that cannot be sold when changing ships due to flooding the market will be lost. More testing needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1940 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-30 18:58:47 +00:00
Nikos Barkas
923e9115d1 Same as previous commit, only slightly better style. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1938 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-30 16:17:53 +00:00
Nikos Barkas
e2b7c71b77 Background HUD images are now also subjected to HUD's overall alpha. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1936 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-30 13:49:35 +00:00
Jens Ayton
9a1db3fe0b shipWillLaunchFromStation event is now sent while player.dockedStation is still valid (bug #14976). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1935 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-30 09:55:44 +00:00
Jens Ayton
4a67f75297 Fixed variable-may-be-used-uninitialized warning in optimized builds (not a real problem). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1934 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 17:08:59 +00:00
Jens Ayton
c3627ea200 Changed cloaking device pod script to use recommended way of testing for player. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1933 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 16:09:10 +00:00
Jens Ayton
7d3b7f9018 Log is no longer allowed to grow significantly beyond 1 GiB (bug #14651) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1931 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 15:58:52 +00:00
Nikos Barkas
8882503eab Fixed the Cloaking Device mission. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1930 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-29 07:02:16 +00:00
Nikos Barkas
c0fc080213 Added docking clearance request key to keyconfig.plist. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1926 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-28 12:17:20 +00:00
cmdrjames
f392942cfc Changes suggested in [ Bug #14797 ] Spacelane 2 is populated along the wrong vector.. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1925 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-27 23:26:43 +00:00
cmdrjames
c750cd46c8 Changes in AI behaviour when attacking NO_TARGET. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1924 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-27 22:49:14 +00:00
Nikos Barkas
2db3ee11d3 Much better fix for the scripted cargopods not getting filled with cargo bug. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1922 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-26 15:46:42 +00:00
Nikos Barkas
9b068c9f4b Fixed scripted cargopods not containing cargo bug. Fixed unsigned going negative bug when trying to buy fuel without having sufficient credits. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1920 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-26 09:01:38 +00:00
Nikos Barkas
bc9cb5af7a Ensure that ships send a HOLD_FULL message only if they actually have cargo carrying capability, as per Eric's recommendation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1919 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-24 10:36:04 +00:00
Nikos Barkas
0d07dd1673 As per Eric's suggestion, -(void) checkForFullHold now sends the AI messages NO_CARGO_BAY if the ship has no cargo carrying capability, HOLD_FULL when maximum cargo quantity has been collected and HOLD_NOT_FULL otherwise. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1918 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-24 10:05:08 +00:00
Nikos Barkas
803b943d1c Fixed incorrect capitalization of the playerStartedJumpCountdown event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1915 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-22 08:05:34 +00:00
Nikos Barkas
73d5b0216b Put back useful comment that was accidentally deleted with previous commit. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1914 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-20 19:41:48 +00:00
Nikos Barkas
0a8c2eca42 Fixed incorrect JS system properties generation. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1912 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-12-20 19:35:03 +00:00