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

1362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc
f7d8cacc11 Can't-stop-bugfixing bugfix. The witchspace/leave aegis & planet vicinity events now fire in the proper order! (Bug #13237) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1523 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-30 06:00:08 +00:00
Marc
62082e6b1e Bugfixes: comms log works as expected. First in, first out. Repairing a damaged weapon (awarded via oxp) doesn't add an extra weapon anymore. (bugs #13471 & #13481). 
Changes: weapon mountings with mounted weapons now in a darker green. awardEquipment: if undamaged equipment present, trying to assign its damaged equivalent will fail with a warning. Trying to award an undamaged weapon using awardEquipment() will also fail with a warning.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1522 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-30 04:33:20 +00:00
Jens Ayton
69003c93ed Added Thargoid Curses to SystemDescription.dot output, and changed the Eat Foo, Bar! insult to use more varied values of Foo. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1521 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 09:31:35 +00:00
Nikos Barkas
d8fd8310da Better fix for the Advanced Space Compass issue. Now works as expected also with the JavaScript player.awardEquipment method. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1520 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 02:30:23 +00:00
Nikos Barkas
eda5722fd9 Fixed Advanced Space Compass not working immediately after being bought. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1519 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-28 01:35:27 +00:00
Erich Ritz
f75d924c76 Fixed compiler warning (changed type int to unsigned). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1518 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-27 22:36:13 +00:00
Nikos Barkas
4d7e682c94 Update to contributors.txt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1517 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-26 19:42:49 +00:00
Jens Ayton
ecec62a702 Added drumz to contributors.txt. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1516 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-26 10:14:59 +00:00
Nikos Barkas
75f2884d30 Fixed yaw continuing to be applied when player was switching to a non-cockpit screen. Thanks go to drumz for this contribution. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1515 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-26 08:06:37 +00:00
Jens Ayton
4c2f7efcb2 Updated dummy joystick handler to pretend to have yaw support. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1514 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 22:42:44 +00:00
Nikos Barkas
adecdd40cd Checking in drumz's analog joystick yaw control code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1513 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 22:09:13 +00:00
Jens Ayton
8cfd109a6e Fix for specular colour being used instead of emmission colour in default-shader materials (copy & paste error). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1512 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 20:31:37 +00:00
Marc
3990d547dc Minor plists cleanup, added player.equipmentStatus & player.setEquipmentStatus, to allow damaging and repairing equipment via javascript. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1511 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-25 03:38:50 +00:00
Jens Ayton
8a3b4539de Fix for % signs in SystemDescription.dot. How did that get there? 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1510 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-24 17:25:44 +00:00
Jens Ayton
8da875682b Fixed breakage in release build; made debug rendering of normals use a debug flag instead of a macro. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1509 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-24 17:14:00 +00:00
Jens Ayton
d9a7e5e585 Adaptive collision octree depth selection; preload sounds from customsounds.plist to avoid stutter. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1508 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-24 16:52:30 +00:00
Jens Ayton
c10eba9821 Slightly prettier graphviz, which is now written to ~/Library/Logs/Oolite/ (OS X) or ~/.Oolite/Diagnostics/ (anything else). This is done via new, not-graphviz-specific method +[ResourceManager writeDiagnosticData:toFileNamed:]. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1507 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-23 22:58:25 +00:00
Jens Ayton
aaa944298d More Graphviz fun: if universe-dump-debug-graphviz is set to true in user defaults, graphs of like_ship relationships and the system description grammar are dumped to the cwd. (Need to fix to dump somewhere sensible.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1506 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-23 17:48:31 +00:00
Jens Ayton
2daba8a6bf Several fixes for an exception when trying to use OXP verifier while a requires.plist-incompatible OXP is installed, due to use of DESC in generating incompatibility warnings (Universe is not set up when OXP verifier runs). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1504 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-23 15:12:22 +00:00
Nikos Barkas
7027fdf905 Fixed some breakage in the NDEBUG build type. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1503 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-22 22:15:53 +00:00
Jens Ayton
590d1f5c81 Fixed buy/sell sounds when buying/selling individual units of commodities. Ambient light is now a mix of 75% sun's diffuse colour and 25% background star average colour, because it was bothering me that light was red in a system with red background stars and a blue primary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1502 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-22 20:45:05 +00:00
Jens Ayton
e8ac184873 Split [PlayerEntity update:] up, and added some judicious exception squelching. Also implemented power braking for ridiculous speeds (starts at 2000 m/s, ramps up to 1% braking at 5000 m/s). With this, an impulse of 20000 m/s throws you about as far as the witchpoint, instead of being effectively unrecoverable. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1501 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-22 16:42:45 +00:00
Jens Ayton
b9d729fb01 Added exception checks in OOLog(). Exceptions caught in [Universe update:] now report context at entity granularity. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1500 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-22 15:26:57 +00:00
Jens Ayton
aa77a4fc6c Fix for getting commodity contracts in loaded games (contracts was loaded immutable). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1499 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-22 01:01:15 +00:00
Marc
8102efee75 Another Demo2 change: no comms message will be received when on Demo2 screen. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1498 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 18:29:44 +00:00
Marc
96330a81a4 Demo2 bugfixes & changes: demo ships calculated at each update, missing/broken ship models displayed as question marks on demo screen, missing textures displayed as no-textures-material. Updated question mark mesh and no-textures-material. Hopefully did not introduce any new bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1497 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:54:43 +00:00
Nikos Barkas
a6187d433a Fixed crash at witchspace for SDL builds. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1496 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 16:30:49 +00:00
Jens Ayton
68fd8f48ef Fix for infinite loop in -removeEquipment: legacy script method (by renaming new ShipEntity equipment method of same name to removeEquipmentItem:, and renaming addEquipment: and hasEquipment: for consistency). Last log line is now included in crash log under Leopard. Added profiling code to OOTextureLoader to see how often loading stutter is due to texture loads (textureLoader.asyncLoad.stall/textureLoader.asyncLoad.notStall log message classes). 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1495 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-21 01:25:22 +00:00
Jens Ayton
4135662dab Folowup to r1493: more static typing, less casts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1494 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-17 11:48:11 +00:00
Marc
e19948c3cd Removed all compiler warnings in GNUstep - seems to still work ok. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1493 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-17 09:21:07 +00:00
Nikos Barkas
b554bb9788 Fixed bug where player would lose target lock whenever a tharglet was becoming inactive. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1492 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-17 07:19:37 +00:00
Jens Ayton
353d2d9371 Tidied out some #ifed-out stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1491 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 23:16:58 +00:00
Jens Ayton
9cfe8c910a Removed all magic equipment flags. Moved equipment list into ShipEntity. Ship loading and saving now mostly uses OOCollectionExtractors, and is generally simpler and more robust. Be on the lookout for interesting new equipment-handling bugs. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1490 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 23:16:07 +00:00
Jens Ayton
abf02e189e Added support for constant vector and quaternion uniforms for shaders. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1489 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 14:15:56 +00:00
Jens Ayton
8339f6a180 #ifdefed out all references to OOBrain and OOInstinct (which were never used and,as it turned out, were only being built under OS X), but left them there in case someone wants to pick up the AI stuff at some point. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1488 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 14:03:49 +00:00
Jens Ayton
5020326bf6 Unbroke docking AI (checked in without finishing up and testing yesterday, oops). Fixed a log typo. Music now resets when player dies. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1487 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 09:52:59 +00:00
Marc
19f2237ffb Bugfix for Bug #12212 - Rising shuttle problems. They now take off directly away from the planet. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1486 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-16 06:51:03 +00:00
Jens Ayton
10ea62d940 Fix for subentity matrix glitch. Added debug drawing stuff for ships with reportAIMessages set. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1485 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-15 16:42:39 +00:00
Jens Ayton
b478d8a435 Nova mission now blows up all stations, not just the main one. Universe addEntity: now returns NO rather than throwing an exception if no slot can be found. Tweaks to autopilot docking behaviour. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1484 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-15 15:09:18 +00:00
Nikos Barkas
8fdf7b21fd Fixed advanced compass not displaying target and beacons when target was selected. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1483 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-15 11:40:58 +00:00
Jens Ayton
59d3a3c389 Fixed a freeze due to UNIVERSE_MAX_ENTITIES being greater than MAX_ENTITY_UID, leading to an infinite loop in -[Universe addEntity:]. _override log message class now works as advertized. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1482 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-14 19:12:41 +00:00
Jens Ayton
2709fd910f Commented on importance of correct ordering in mission response scripts. (Oh, and r1479 _is_ a fix for the nova problem, I wasn't reading it right.) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1481 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-14 18:23:13 +00:00
Jens Ayton
e1bdfc8924 Added great big heaps of spiff to OS X debug thingy. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1480 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-14 01:32:00 +00:00
Marc
c809a1fe07 Bugfix: made nova mission work properly. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1479 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-12 22:34:42 +00:00
Nikos Barkas
c3ad195de4 Checking in possible fix for the nasty bug that occasionally would cause Oolite to crash after having consumed all memory during system population. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1478 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-12 06:51:42 +00:00
Jens Ayton
f67b87aa0d Ahruman's dazzling distraction attack strikes again. All beep, boop and click sounds now go through customsounds.plist. Setting the player's target through JS now works more or less as expected (locks on ident, with UI feedback, unless a missile is selected in which case current missile is locked on to the new target). Custom sound tags can now expand to other custom sound tags (with recursion checking), and final results are cached. No actual progress on the nova script I thought I was working on. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1477 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 19:49:46 +00:00
Jens Ayton
627e5a9b57 shipWillLaunchFromStation() is once e again called for the player. Ejected items and debris are now spawned with 85% of the parent's cabin temperature. Incompatible OXP message is now loaded from descriptions.plist, but only the internal descriptions.plist; listing incompatible OXPs and generating the messages later would be a better approach. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1476 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-11 08:25:42 +00:00
Jens Ayton
9f9df1e986 Fix (and cleanup) for Thargoid death broadcast. Added code to hopefully work around sky rendering glitch on S3 hardware. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1475 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 19:48:28 +00:00
Jens Ayton
86b976ca0f Updated standard Xcode project to match previous revision. Checked in a bunch of display management stuff I was workin g on earlier; won't be used in 1.71. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1474 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:27:26 +00:00
Jens Ayton
197119ccc8 All scripts now JavaScript -- adopted somewhat twiddled versions of Eric's scripts, with the cleanup stuff removed (premature optimization is the root of all evil; I'll put it back in if anyone has profiling information indicating it's actually a win). Moved the mission screen function into global-prefix as a generally-available utility function. Wrote JS scripts for the two remaining ships using death_actions. Added Ship.explode(), which kills any ShipEntity through energy damage including the main station. Once again made blowing up the main station with blowUpMainStation (or explode()) work. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1473 127b21dd-08f5-0310-b4b7-95ae10353056
 2008-03-10 00:01:30 +00:00