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

849 Commits

Author SHA1 Message Date
Eric Walch
bb50cc8433 - takeSnapShot() is excluded from the timelimiter. 
- scooping constrictor pilot without killing the ship no longer gives a success message.
- activating a "becomeEnergyBlast" or "becomeExplosion" within a shipDied event, no longer triggers a new shipDied event.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4794 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-03-04 16:04:45 +00:00
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
Eric Walch
fd073849fe - Ships that have a specific commodity defined as cargo, no longer get their bounty reduced to 10% when the pilot ejects. 
- The scoop icon now correctly shows a full cargo hold when special cargo is transported.
- Added code that points the ships towards the station during stationkeeping. Main reason is that the player has something to watch when waiting.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4744 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-18 21:41:37 +00:00
Jens Ayton
deb8b846be Cleanup. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4741 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-18 15:23:11 +00:00
Jens Ayton
121f6ef237 Slightly simplified default fragment shader now that we don't need to worry about Mac OS X 10.4 compatibility. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4739 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-16 18:53:56 +00:00
Eric Walch
e5a6411d1a - using the js method 'launchPlayer()' during one of the two docking handlers has no longer any undesirable side effect. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4737 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-11 19:43:16 +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
cb2d00a924 Bump version number to 1.77; start new Changelog. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4691 127b21dd-08f5-0310-b4b7-95ae10353056
 2012-01-03 15:14:11 +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
Nikos Barkas
c665a084d8 MNSR step 1: Rolling version number to 1.76. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4674 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-03 17:51:19 +00:00
Eric Walch
450c395138 - AI fix for homeAI. When multiple escape pods are launched, there is no longer a part suddenly disappearing. 
- AI fix for looting to prevent a ship circling around a cargo pod as I witnessed the other day.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4673 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-12-02 17:18:30 +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
49c928fead Bumpy bumpy version. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4579 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-07-12 07:32:26 +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
Eric Walch
8316cc2a1d - Docking/launching ships now look at totalBoundingBox instead of boundingBox to see if they fit in the dock. Same boundingBox to totalBoundingBox change for calculating needed orientating to the dock while docking. 
- enteringTraderAI now checks for interstellar space (in case of a misjump).

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4553 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-18 20:16:57 +00:00
Jens Ayton
774c4b922b Versions that go bump in the night. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4550 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-09 20:50:15 +00:00
Jens Ayton
21feac565f Remastered application icons. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4543 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-07 13:21:54 +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
Jens Ayton
396a29a9c1 Removed patent nonsense from default vertex shader. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4534 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-05-01 16:10:30 +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
aee593fa13 Fixed some comments. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4530 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-28 18:47:04 +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
Eric Walch
34b4427b41 - Ships disgorging from wormholes now also use witchspaceLeavingEffects 
- Pirate Escorts now correctly follow their leaded trough a wormhole
- Added the AI message ACCEPTED_ESCORT to be able to send attack instructions to the escort when self in fight.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4523 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-24 10:07:33 +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
32e521da25 shipSpawned() now fires for the main station, but launch_actions still do not. See http://aegidian.org/bb/viewtopic.php?f=3&t=9520 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4502 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-04-01 16:46:15 +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
cfb869eba9 Version bump. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4472 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-13 12:21:36 +00:00
Jens Ayton
2cf7cfea37 Preliminary 1.75.1 release notes. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4456 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-10 22:02:52 +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
Jens Ayton
bce1bf09d8 Style tweak. 
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4440 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 22:34:35 +00:00
Eric Walch
d915a49dcd - Changed the priority order for the docking computer in the mainStation eagis. 
- Fixed a deprecated (but probably never used) command in the cloaking device script.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4438 127b21dd-08f5-0310-b4b7-95ae10353056
 2011-03-07 20:55:48 +00:00