6168 Commits

Author SHA1 Message Date
AnotherCommander
7f5824b8e0 Update to latest Windows dependencies revision. 2014-10-26 19:07:25 +01:00
AnotherCommander
0988daae6e Merge branch 'master' of github.com:OoliteProject/oolite 2014-10-23 19:11:02 +02:00
AnotherCommander
1da563ea57 Yet another update to latest revision of the Windows dependencies. 2014-10-23 19:07:06 +02:00
cim
92c0482aad Show JS error locations when showLocation is true
That ! has been in there a very long time so I'm not sure how this ever worked.
2014-10-23 18:03:47 +01:00
cim
b20d981c16 Fix Cobra I role list 2014-10-23 18:03:47 +01:00
AnotherCommander
da59d61219 Update Windows dependencies submodule to latest revision. 2014-10-23 10:50:57 +02:00
AnotherCommander
773b37163c Update changelog with recent sun glare fix. 2014-10-21 17:21:44 +02:00
AnotherCommander
4e56de8bde Handle sun glare correctly also for too tall or too wide game windows. 2014-10-15 14:33:10 +02:00
cim
6a9663121c Fix air resistance bug 2014-10-14 20:42:13 +01:00
Jens Ayton
877925293d Raise string encoding conversion cache size
This alleviates #113.
2014-10-08 13:31:47 +02:00
AnotherCommander
bbbebc98af Prevent Windows from freaking out when the fullscreen window was moved by means of hotkeys while maximized. 2014-10-06 14:00:46 +02:00
cim
a8cc18e0fc Fix deployment build 2014-10-05 14:20:29 +01:00
cim
ab7a01eb23 Sort out some possible cases where nil might be set to a dictionary 2014-10-04 20:30:04 +01:00
cim
5d07437a55 Merge pull request #112 from OoliteProject/customisable-laser-properties
Customisable laser properties
2014-10-03 21:44:51 +01:00
cim
6bf2bb00a1 Fix submodule status in branch 2014-10-03 21:33:51 +01:00
cim
4d0d85f6cf Add 'gamePaused' and 'gameResumed' world events
Useful for sound OXPs to safely suspend sound playback.
2014-09-30 18:16:10 +01:00
cim
49db516d3d Make sure all populator-added hermits are CLASS_ROCK 2014-09-29 19:51:56 +01:00
cim
e1447d70ae Fix weapon loading from shipdata 2014-09-28 21:14:37 +01:00
cim
845bd30531 Adjust name of laser removal option 2014-09-28 18:13:56 +01:00
cim
a66d587724 Fix another merge conflict 2014-09-28 17:37:13 +01:00
cim
fce1ce8e96 Merge branch 'master' into customisable-laser-properties
Conflicts:
	src/Core/Scripting/OOJSShip.m
2014-09-28 17:24:26 +01:00
cim
483070ece2 Merge pull request #111 from OoliteProject/oxz-manager-extras
Oxz manager extras
2014-09-28 17:22:41 +01:00
cim
2392f33aa3 Fix bug with weapon_energy property
(Property no longer applies to laser damage - creating a custom weapon
is more practical)
2014-09-28 16:34:29 +01:00
cim
49973f7853 Allow customisable laser settings 2014-09-28 14:59:06 +01:00
cim
f01bca3b37 Adjust laser settings to use just one function
NPCs now use energy for their shots
2014-09-27 17:39:50 +01:00
cim
d362b5113a Add tag search and "last updated" search to filters 2014-09-27 15:40:57 +01:00
cim
dc8471c349 Add "installable" filter, make left/right arrow keys consistent 2014-09-26 21:40:26 +01:00
cim
5e491c299f Adjust instructions 2014-09-26 15:59:12 +01:00
cim
3560b69f99 New 'x' option to automatically extract OXZs to OXPs 2014-09-26 15:47:41 +01:00
cim
cdae2911a1 Add 'i' for information to OXZ manager
This allows additional paragraphs to be put into the description tag.
Before this is merged and people start being encouraged to use that for
extra readme information, the manifest API on the website needs to be
modified to only send the first paragraph of the description to Oolite/1.80
or earlier.
2014-09-25 20:41:47 +01:00
cim
866d314e03 Add keyword, author searches; adjust layouts 2014-09-25 16:49:05 +01:00
cim
3648a4d9a6 Start of filter implementation
Also a better calculation of OXZ install status
2014-09-25 15:17:42 +01:00
cim
75f2ba8a59 Offer to update OXZ list each time Oolite started and manager opened 2014-09-25 11:54:57 +01:00
cim
9f71a6cb20 Generalise filtering mechanism
Cleanup and simplify some other bits of the OXZ manager code
(next step: add some actual filters)
2014-09-25 11:35:17 +01:00
cim
a961f78a9c Fix return type of EquipmentInfo.requiredCargoSpace 2014-09-23 21:15:59 +01:00
cim
b04f06d46d Fix signedness problem
Hopefully without reintroducing the problem which 8ee25f04 fixed
2014-09-23 20:50:42 +01:00
cim
f5b950c6df Update torus drive to be even faster if a long way from nearest object
Very experimental - based on old suggestion at
http://aegidian.org/bb/viewtopic.php?p=185086#p185086
Can be disabled easily by changing the OO_VARIABLE_TORUS_SPEED #define

Should make it a bit more practical to use the OUTER_SYSTEM and
OUTER_SYSTEM_OFFPLANE locations without requiring excessive flight time
2014-09-22 22:22:02 +01:00
cim
f228187032 Decelerate faster when mass-locked
Experimental - give more chance to assess and react to NPC packs before
reaching laser range - as you would if not using torus drive.
2014-09-22 22:22:02 +01:00
AnotherCommander
6439b8775e Fix Windows hotkeys causing fullscreen to jump around monitors also in the case of displaying the GameOptions screen. 2014-09-22 18:38:17 +02:00
AnotherCommander
62ea1a6214 Windows multimonitor support: Do not allow Windows hotkey shortcuts to mess with full screen. Pressing Shift+Winlogo+Left/Right Arrow does not cause the fullscreen window to jump in a buggy way to the next monitor anymore. 2014-09-22 17:55:00 +02:00
cim
2b7df8cce1 Adjust odds calculator
Groups will now engage in combat without needing an excessive advantage over
the opposing force - 3:1 or even lower odds will be fine (a Krait assassin
will sometimes attack a Cobra III, because of its high armament)
2014-09-22 16:21:39 +01:00
cim
2a973dddd9 Add some global difficulty bias parameters to the populator script 2014-09-22 15:04:07 +01:00
cim
f9d8d9f2be Adjust standard missiles to be unlikely to kill a fully-shielded Cobra III 2014-09-22 14:43:23 +01:00
cim
306d74dbd8 Fix placement of "use strict" in the debug console 2014-09-21 20:26:11 +01:00
cim
2a322b788b Make some JS properties read/write
- maxYaw, maxPitch, maxRoll
 - maxThrust, thrust (for player), maxSpeed
 - maxEnergy, energyRechargeRate
2014-09-21 20:26:11 +01:00
KonstantinosSykas
2e41c87ec0 Forgotten fix from previous commit on sortedArrayUsingFunction warnings 2014-09-21 21:30:05 +03:00
KonstantinosSykas
6d22ac8996 Fixed Linux build warnings on sortedArrayUsingFunction
injected from commit #fa805ce
2014-09-21 21:15:03 +03:00
Jens Ayton
86ded4d81a Mac: perform Xcode upgrade check, upgrade unit tests 2014-09-21 14:20:30 +02:00
Jens Ayton
24ab742991 Mirror Mac dependencies on oolite.org 2014-09-21 14:07:50 +02:00
Jens Ayton
dcca8d1763 Xcode 6 compatibility
* Always use latest Mac OS X SDK
* Don't build fake poll() in libnspr
* Suppress auto-import warnings (applies to Xcode 5.1 too)
2014-09-21 12:44:13 +02:00