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

2598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jens Ayton
ca22a0c7e8 Fixed crash on loading meshes with explicit normals. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3116 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 15:14:21 +00:00
cmdrjames
59512459b1 Add a new line at end of OOJSShip.m because Frame gets a compiler warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3114 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-04 09:44:11 +00:00
Jens Ayton
f1fb04a35b +[NSColor brightColorWithDescription:] now returns a colour with the right hue for dim colours. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3113 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 23:53:31 +00:00
Jens Ayton
b62a423bdb Belated cache rebuild forcamication. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3111 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 23:00:21 +00:00
Jens Ayton
4e8693b5bf Unlied in a comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3108 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:43:11 +00:00
Jens Ayton
462ec72a19 Fixed other source of DEADBEEF in cache: uninitialized per-vertex normal and tangent buffers being written for per-face-normal meshes. Also fixed some nits found when test compiling with clang. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3107 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:41:15 +00:00
Jens Ayton
5b01696b5d Replaced magic isBoulder flag with silly role set tricks, and made ships' role sets effectively mutable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3106 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 18:03:23 +00:00
Jens Ayton
966ee404e4 Annotated clang static analyzer false positives, and fixed one genuine leak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3105 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 17:17:32 +00:00
Jens Ayton
48e2ffb5ea Removed superfluous build settings that caused a build error in Xcode 3.2.2. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3104 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 15:52:56 +00:00
Jens Ayton
33e21d7138 Lowered kOOMeshMaxVertsPerFace from 16 to 3, saving 260 bytes per face in all meshes. Non-triangular faces haven't rendered properly for a long time anyway. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3102 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 14:11:13 +00:00
Jens Ayton
78a93c52ee Fixed bug where a maliciously crafted DAT mesh may lead to an unexpected termination or arbitrary code execution, as Apple would put it. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3101 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 14:01:31 +00:00
Eric Walch
5bc2b334a2 defined a not initialised variable added in rev 3091 that gives a compiler error on Linux builds. (Thanks Nicos for pointing me to it) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3098 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 11:13:45 +00:00
Jens Ayton
59bf82e34e Timeout on iTunes-controlling AppleScript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3097 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-03 11:08:00 +00:00
Marc
a58863656d Updated verifier schema with rev3091's changes, and added two stray keys to both verifier files. :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3094 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 21:19:40 +00:00
Eric Walch
79e39c5f6e - added a shipKey: market, to define a local market for stations with primaryRole as the default market. 
- added a shipKey: hasScoopMessage, to be able to suppress the standard scoop massage for cargo.
- added the JS method: setCargo to set cargo type and quantity for barrels.
- Scripted cargo that is awarded a content (either by setCargo or the skipKey cargo_carried) is not removed from the universe on scooping but stays in the hold of the scooper.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3091 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 19:29:12 +00:00
Nikos Barkas
f65c78fb8b Added basic documentation outlining the modifications done to the source code of some of Oolite's external dependencies, required for a successful build. A review of the content referring to Mac may be needed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3084 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-04-02 09:01:02 +00:00
Nikos Barkas
b937604e9a Fixed bug in awarding kg or g unit items while in-flight, resulting from the cargopods previous handling change (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3083 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-28 14:58:29 +00:00
cmdrjames
4a05faff16 Oops, revert some laser breakage. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3082 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-27 20:14:17 +00:00
Nikos Barkas
9218793a52 Possible fix for bug reported at http://www.aegidian.org/bb/viewtopic.php?t=7742. Kilogram quantities greater than 1000 and gram quantities greater than 1000000 are now placed in 1t cargopods. So 2470kg gold will use two cargopods and leave 470kg in the 'safe'. Added the StationEntity property suppress_arrival_reports, does what says in the tin. The property is visible from JS via suppressArrivalReports. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3081 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-27 19:02:11 +00:00
Jens Ayton
a79eae0acc Better error logging when loading a saved game fails. Fixed up some script comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3080 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 23:07:23 +00:00
Eric Walch
d8f7728c72 - Added a "guiScreenWillChange(to, from)" handler. 
- Some code cleanup.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3079 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-26 16:16:32 +00:00
cmdrjames
8ad9a4ad7b Changes from PhantorGort: Currently I am developing an OXP (Visas) that allows for complex criteria for the "Visa" equipment. I was intending to update the appropriate mission variables used by the equipment as the player enters the equipment screen. Example scenario: a visa has as one of it's requirements of the player having to have a minimum amount of credits in their account. If you buy or sell goods, etc, I need to update the mission variables. This idea could also apply to requirements based on contracts accepted or other equipment bought or ship bought, etc. As these things can change whilst the player is still in the station being able to update the mission variable before the equipment calculation is crucial. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3078 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 20:09:40 +00:00
Jens Ayton
978adf3b55 Even more properly addressed Linux build issue. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3077 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 19:30:41 +00:00
getafix
3a210a04d8 Properly addressed Linux build issue. (thanks another_cmdr) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3076 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 19:20:49 +00:00
getafix
25f8b24e41 Quick fix of error injected at r3072, causing Linux build to fail. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3075 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-23 06:33:29 +00:00
Nikos Barkas
c6da83b81c Moved the doScriptEvent execution handler inside the disengageAutopilot method. Moved screen messages out of engage/disengageAutopilot methods in order to enable also 'silent' manipulation of autopilot, e.g. starting autopilot without having docking computer should not print any messages. Added the station we are trying to autopilot to as argument in the event handler for autopilot startup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3074 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 11:39:02 +00:00
cmdrjames
bc948d492a Minor docking changes to fix xcode build. (missed a file) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3073 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 11:01:03 +00:00
cmdrjames
b8a5a35118 Minor docking changes to fix xcode build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3072 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 10:58:33 +00:00
Nikos Barkas
97dbb37187 Fixed warning in Mac build (thanks Eric). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3071 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-21 10:44:27 +00:00
Nikos Barkas
2ea88ee608 Autopilot overhaul: Moved duplicated code to separate methods in PlayerEntity, namely -engageAutopilotToStation: and -disengageAutopilot:. Docking Computers now stop trying to dock the player when damaged while in operation. Created the JS PlayerShip methods engageAutoPilot (takes as parameter the station entity we are trying to dock to) and disengageAutopilot. These two deliberately do not check for the existence of docking computers before activating/deactivating the autopilot. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3070 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-20 15:50:15 +00:00
Eric Walch
1b6c9559c8 player.ship.hud = null now resets the hud for the default one for that ship. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3069 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-20 12:15:17 +00:00
Eric Walch
c1073f15a7 Player can now break-off auto docking when the equipment was damaged while busy autodocking 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3068 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-19 16:13:59 +00:00
Nikos Barkas
ecccd444d5 Fixed a couple of warnings on SDL builds, related to missing AI.h header in ShipEntityLoadRestore. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3067 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 23:35:17 +00:00
Eric Walch
7b4feb7bd7 - Mac only: Changed the key for opening folders in the save/load menu from Command to Control. (Same key as used with Windows) 
- Filled in some blanks for saving/restoring wormholes ships in the save file. Escorted ships now seem to continue being escorted from a loaded game. 

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3066 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 20:05:03 +00:00
Jens Ayton
b19e4b4a5f Added optional exolicit binormal generation to icosmesh tool (not used in Oolite at the moment). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3065 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-17 17:34:44 +00:00
Eric Walch
254b2fbea1 - Corrected several ships from one group ending at very different locations after wormholing a group when the player entered that systems with a long delay. e.g. after first docking at the station. (File missed in yesterdays commit) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3064 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-14 13:21:22 +00:00
Eric Walch
49fd2d95a9 - Prevent resetting the random seed when displaying the F7 screen 
- Make sure that a group of ships that disgorges from a wormhole ends up close together in case of updated times of several minutes. (Escorted groups sometimes were added at several scanner ranges distance between ships when the player did not follow immediately)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3063 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 22:02:27 +00:00
Nikos Barkas
ce68535dde Replaced switchHudTo JS method with the PlayerShip JS read/write property player.ship.hud, as per discussion in internal dev mailing list. Removed some code duplication while doing so and hopefully have not broken anything in the process. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3062 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 20:31:56 +00:00
Jens Ayton
a1114c9b72 Fixed models being copied to wrong place (Mac only). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3061 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 17:29:22 +00:00
Jens Ayton
02e4b2bf8a Fixed Mac build. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3060 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-13 15:05:22 +00:00
Nikos Barkas
4146d76250 Fixed silly crash from revision 3058. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3059 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-11 11:00:06 +00:00
Nikos Barkas
ba9055cfea Implemented the PlayerEntity -switchHudTo: method, which takes as parameter the filename of the plist containing a hud definition and its equivalent JavaScript PlayerShip method, thus enabling on-the-fly HUD changing. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3058 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-09 22:15:39 +00:00
Eric Walch
3e93d1f6e6 Restore the original thrust for cargo that escaped the tractor beam. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3057 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-07 22:54:40 +00:00
Nikos Barkas
e50f8ade39 Fixed a small bug where having Commander Jameson killed would restart the game with condition green instead of docked. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3056 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-06 22:39:16 +00:00
Jens Ayton
535798a07c Improved :spawn macro to save new ship in a property and print a message on failure. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3055 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 23:24:35 +00:00
Jens Ayton
129e5129f6 ProxyPlayerEntity is now used for demo ships, loading screen and shipyard. Also, player uniform bindings are now actually permitted for ProxyPlayerEntities. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3054 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 22:17:51 +00:00
Jens Ayton
b44393e781 More work on player shader binding issue: ProxyPlayerEntity is now used when ejecting. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3053 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:52:07 +00:00
Jens Ayton
29e904f0f6 More work on player shader binding issue: implemented ProxyPlayerEntity class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3052 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 21:23:31 +00:00
Jens Ayton
a4382b451f Fixed bug where space dust velocity ignored inertial velocity of player, taking only thrust into account. Exposed player velocity to JS. Initial work on fixing player-only shader binding issue described at http://aegidian.org/bb/viewtopic.php?p=103930#103930 . 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3051 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-03 18:04:06 +00:00
Jens Ayton
94d00e8086 Followup to r3049: second occurrence of same mistake. Also, fixed a typo in a makefile comment. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3050 127b21dd-08f5-0310-b4b7-95ae10353056
 2010-03-01 23:22:32 +00:00