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

620 Commits

Author SHA1 Message Date
Jens Ayton
a106f4055f Shader synthesizer: light maps can now be controlled by bindings. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4793 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-26 17:08:49 +00:00
Jens Ayton
df1412c57b Shaving the yak fantastic. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4773 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-11 15:53:58 +00:00
Eric Walch
6fd5701273 - added two AI commands: setTargetToRandomStation and setTargetToLastStation. 
- setTargetToRandomStation will select a random station from all stations within 'desiredRange'. Carriers and stations without npc_traffic are excluded. It returns "NO_STATION_IN_RANGE" or "STATION_FOUND"
- setTargetToLastStation sets the primary target to the last selected station. It returns "NO_STATION_FOUND" when the last station lo longer exists.
- Updated the route1traderAI.plist so that ships with bounty no longer go to the main station as default but start looking for a random station.

- Bugfix: Activating the fuel injector while deceleration from torus speed, no longer drops the speed immediately to max-injector speed.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4770 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-08 19:45:39 +00:00
Jens Ayton
dce3f842ce Fixed normal and parallax mapping with shader synthesizer. Player Cobra 3 is temporarily pink while using synthesizer. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4765 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-02-08 00:34:07 +00:00
Jens Ayton
5377668ea8 Restored energy bomb compensation and made energy bomb strict mode only again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4755 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-31 19:17:45 +00:00
Michael Werle
7312ad733c Bump copyright to 2012. Happy New Year! 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4692 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 16:08:14 +00:00
Michael Werle
d4066989e8 Reverse Compass - allows stepping backwards through beacons. 
Shift-\ (|) is now bound to stepping through the Advanced Space Compass's
targets in reverse order.  Beacon-list has been converted to double-linked
list to facilitate this.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4689 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-02 20:37:06 +00:00
Jens Ayton
527b3214c7 Remapped ASS to Assignment in JS error identifiers. Also added some missing ones. Hmm, this should be automated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4686 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-25 11:30:17 +00:00
Jens Ayton
e7076105a3 Comment typos. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4685 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-24 09:09:24 +00:00
Marc
d2922e78d4 More js reset fixes: 
- made js engine less likely to stall on reset after player's death.
 - better feedback in case of load game failure due to js issues.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4665 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-28 01:17:03 +00:00
Eric Walch
cf7ed44372 - Launching traders with a 'sunskimmer' role now start with sufficient heat insulation for sunskimming. 
- Added an AI command 'checkHeatInsulation' (returns either: INSULATION_OK or INSULATION_POOR)
- ship_temperature no longer becomes negative (and stays negative) after a witchspace jump from a hot area. (delta_t can be several seconds on the first update after a jump)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4647 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-11-15 19:41:46 +00:00
Nikos Barkas
2bc085b4d0 Fixed key_map_home assignment so that it corresponds to the correct Home key code. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4625 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-10-19 13:17:01 +00:00
Eric Walch
3db424c845 The dumping of the entity list when the universe is full can now be controlled through the logcontrol.plist. Default is no dumping. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4622 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-10-17 14:25:20 +00:00
Marc
b2e41a0306 * 2 deployment fixes: 
- '*' creates a snapshot, as per 1.65 - fixed SDL inconsistency, so numpad '*' also works.
 - 'o' switches the HUD on & off - its js equivalent also works. Inexplicably that key was left hardcoded while all other keys were moved to keyconfig.plist - fixed that too.
* hopefully finished fixing windows' UK keymapping.
* fixed intro inconsistency between game startup, and restart (now the cobra 3 caption shows for exactly the same amount of time in both cases).
* Fixed minor autosave glitch - no more unnecessary autosaves immediately after saving a game manually.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4617 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-10-14 13:49:27 +00:00
Eric Walch
8ba93d4115 - The AI commands 'becomeExplosion' and 'becomeEnergyBlast' now also trigger the shipDied event handler. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4604 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-26 19:34:19 +00:00
Nikos Barkas
063427c16e Fixed weapon name displayed always as '<position> <type> laser' on the status screen, even after editing it in equipment.plist. As a result, the weapon_name array in descriptions.plist is no longer necessary. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4600 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-19 22:53:46 +00:00
Eric Walch
5013d3c330 - Fixed bug #17997. When very close to the dock, the player now gets a few extra seconds to finish docking or to back off. 
- Fixed a bug where the player got docking clearance while there were still ships in the launch queue.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4593 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-08-11 16:52:16 +00:00
Jens Ayton
47d4b2c6f1 Added sunskim-trader to pirate victim roles. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4565 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-06-21 22:14:48 +00:00
Jens Ayton
35ecbe0fab Removed logging, which isn't getting us anything. Also reenabled JavaScript usless-expression warning. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4536 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-04 07:05:17 +00:00
Marc
5b83750a31 More on fuel prices: 
- implemented dynamic version of fuelChargeRate.
 - removed protected fuel_charge_rate variable from shipEntity object.
 - initial implementation of post-MNSR - more accurate - fuel ratio calculations, bracketed by '#if 0's

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4532 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-29 21:27:55 +00:00
Jens Ayton
a1b28ecb52 Rolled back r4524. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4525 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 23:21:50 +00:00
Marc
69fa821072 Heat shields now compatible with strict mode... fixed one standard mission in strict mode, and made fuel collecting in strict viable again. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4524 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 16:16:03 +00:00
Jens Ayton
54780c3ac8 Fixed a punctuation error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4522 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-22 17:54:41 +00:00
Jens Ayton
a943c4d41a Cleaned up various script.foo.trace log message classes so they can actually be used to debug stuff. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4500 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-31 20:41:56 +00:00
Jens Ayton
67aa1fb371 Default HUD roll and pitch indicators no longer overlap. (Bug #17916) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4493 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-26 19:16:16 +00:00
Jens Ayton
9570880ccf Fixed C&P error. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4478 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-15 21:08:24 +00:00
Jens Ayton
2062a1607c Disabled shaders for AMD R600/R700 GPUs using Gallium until I can get some testing and debugging done. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4477 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-15 21:06:57 +00:00
Jens Ayton
fa23e7bc11 Set max_missiles to 4 for NPC cobra3. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4454 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 20:53:53 +00:00
Jens Ayton
037592aea8 Removed unused log message class. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4449 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 16:02:05 +00:00
Jens Ayton
2a8c8c7fe0 Fix exception on setting more than 16 pending escorts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4448 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 16:01:10 +00:00
Nikos Barkas
031848917f Fixed some spelling in mission texts. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4426 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-03 09:23:25 +00:00
Jens Ayton
8434e83af3 [Mac] Support for game pads that actually describe themselves as game pads rather than joysticks. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4399 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-23 22:26:50 +00:00
Jens Ayton
fbaaec461f Fixed credits formatting on game over screen. gameoverscreen-score-@-f is now gameoverscreen-score-@. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4396 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 23:46:37 +00:00
Jens Ayton
1bb89377ce Added logging for about-to-load-JavaScript, and enabled it by default (for 1.75.1) to catch a crasher. http://aegidian.org/bb/viewtopic.php?f=3&t=9223 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4395 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 21:27:54 +00:00
Eric Walch
6d1743d8c8 - Spelling corrections. 
- Reverted a accidentally committed file

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4394 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-22 20:02:08 +00:00
Marc
188c0f4f35 'Credits' changed to 'credits' in processEscapePods. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4378 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-19 07:40:35 +00:00
Jens Ayton
0deb3f4d6c Added logging of reason for quitting - log message class exit.context, off by default. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4367 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-17 15:21:48 +00:00
Jens Ayton
e26df7e3f8 Added phonetic guide for S.O.S. in PlainTalk, and added some spacing around strings for symbols. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4366 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 21:00:21 +00:00
Nikos Barkas
04037c060d S.O.S. is now correctly spoken on the GNUstep builds as 'Ess Ooh Ess', instead of 'Ess Dot Ooh Dot Ess Dot'. Mac pronunciation needs to be confirmed. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4365 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 20:28:33 +00:00
Jens Ayton
1e08cd022f Use recommended keys for fallback material. Removed some new-planets stuff that isn't used. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4363 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-16 16:44:29 +00:00
Nikos Barkas
c7722133f0 Removed excess punctuation in the Thanks! message, which was causing it to be pronounced as <thanks exclamation>. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4353 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-14 20:21:09 +00:00
Jens Ayton
944ac15e75 Removed unused instance variable key_autopilot_target. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4333 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 15:31:49 +00:00
Jens Ayton
79a9d11f29 Changed handling of speech synth Incoming message string to be friendlier to existing localizations. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4332 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 14:57:40 +00:00
Jens Ayton
954f5b4ef7 Removed unwarranted setTargetToFriendlyStation AI method alias, and moved setUpEscorts alias to right place. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4330 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 14:38:06 +00:00
Jens Ayton
2edd4b4122 Squelched all ship.setUp.missiles messages, and removed roleSet.deprecated. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4329 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-12 13:40:55 +00:00
Jens Ayton
0c2e8f6427 Removed vestigial breakpattern model defaults. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4323 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-11 22:15:59 +00:00
Jens Ayton
54d5c4b350 Breakpattern entity reform. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4266 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-08 19:09:22 +00:00
Eric Walch
cdea79b71c - Excluded the kZeroVector as missile_launch_position because it hangs Oolite. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4234 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-05 12:13:05 +00:00
Eric Walch
687f4be4d0 _ Corrected the missile_launch_position for thargoids and added an error message for other oxp ships with similar wrong positions, while ignoring the faulty positions. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4219 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-03 11:19:49 +00:00
Marc
40184ebb0c Duplicate strings part II: restored the previous translation strings. Distance and estimated travel time strings can now be overridden globally, or assume separate values depending on which chart is displayed! :) 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4211 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-02-02 09:53:03 +00:00