Scott Howard
d01e8cc97d
PositionCell/PlaceItemCell: add console message if cell doesn't exist
2015-03-03 17:36:22 -05:00
Scott Howard
53213bf236
if cell doesn't exist, PositionCell and PlaceItemCell warn std::err but still execute, bug #2407
2015-03-02 11:53:59 -05:00
Marc Zinnschlag
64938b3796
Merge remote-tracking branch 'cc9cii/saving-skil'
2015-03-01 10:36:26 +01:00
Marc Zinnschlag
185757da43
Merge remote-tracking branch 'dteviot/Bug2367'
2015-03-01 10:24:02 +01:00
Marc Zinnschlag
59c7fe28d9
Merge remote-tracking branch 'naclander/master'
2015-03-01 10:23:08 +01:00
Marc Zinnschlag
babac842f6
Merge remote-tracking branch 'scrawl/joystick'
2015-03-01 10:01:10 +01:00
dteviot
cdee6f41fc
fix: multi effect spell with different ranges ( Fixes #2285 )
...
Applies all effects for a spell with multiple effects, where not all effects have the same range.
2015-03-01 15:34:18 +13:00
cc9cii
5ff66ad40b
Fix Bug #2402 . SKIL records should not have NAME subrecord.
2015-03-01 13:09:23 +11:00
dteviot
41e15e0c2d
Limit maximum attribute damage ( Fixes #2367 )
...
Maximum damage that an attribute can have = base + fortify.
2015-03-01 10:27:51 +13:00
scrawl
76732b475a
Remove leftover
2015-02-28 16:37:06 +01:00
dteviot
5e2839977b
file extension comparison needs to be case insensitive.
2015-02-28 20:25:03 +13:00
dteviot
54e3ebde63
addon list in launcher shows addon files with no dependencies ( Fixes #2348 )
...
Also, game files must end with ".esm" or ".omwgame".
2015-02-28 17:13:21 +13:00
scrawl
0cd5437595
gamecontrollerdb.txt updated from upstream, added link and license
2015-02-27 22:37:29 +01:00
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
2015-02-27 22:37:22 +01:00
Digmaster
84ff11d0ab
check if v2 exists before attemping to copy it
2015-02-27 22:21:33 +01:00
Digmaster
464bbe4d6f
if v2 doesn't exist, don't erroneously set keyboardUserExists to true.
2015-02-27 22:21:07 +01:00
Digmaster
5d77ebdc60
If v3 doesn't exist, copy from v2
2015-02-27 22:21:07 +01:00
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
df5513da7c
uses v3 input bindings, not v2
2015-02-27 22:19:13 +01:00
Digmaster
a192836582
(hopefully) correct gamecontrollerdb.txt behavior
2015-02-27 22:19:13 +01:00
Digmaster
796b4b01b0
Fix activating every frame when action is bound to a trigger
2015-02-27 22:19:13 +01:00
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f
Minor code cleanup
2015-02-27 22:19:08 +01:00
Marc Zinnschlag
44d1f43b2b
Merge remote-tracking branch 'sandstranger/fixes-for-android'
2015-02-27 10:34:41 +01:00
sylar
edd3f9f95c
small fix for float
2015-02-27 08:58:00 +04:00
sylar
cef725012c
fix transpose error fo gles2
2015-02-27 08:56:20 +04:00
Marc Zinnschlag
093c577895
Merge remote-tracking branch 'dteviot/Bug2344'
2015-02-26 19:05:30 +01:00
sylar
cda3782cf2
fix crash game on Android after start loading
2015-02-26 18:30:38 +04:00
sylar
70398e2f9f
change Jni name method
2015-02-26 18:30:14 +04:00
sylar
1bb29f610f
enable mipmapping for Android again
2015-02-26 18:29:38 +04:00
Marc Zinnschlag
70a482b3e8
Merge remote-tracking branch 'dteviot/Bug2346'
2015-02-26 13:26:45 +01:00
Marc Zinnschlag
80e6df6092
Merge remote-tracking branch 'scrawl/opencs'
2015-02-26 13:25:56 +01:00
Marc Zinnschlag
281e0042ab
Merge remote-tracking branch 'scrawl/master'
2015-02-26 13:23:15 +01:00
dteviot
72e94380be
fix: boost::filesystem::canonical() available from version 1.48.
2015-02-26 20:07:23 +13:00
scrawl
e7989a197d
Add defaults for some required globals ( Fixes #2397 )
2015-02-25 20:35:11 +01:00
scrawl
3158d34abb
Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.
2015-02-25 20:25:41 +01:00
Marc Zinnschlag
a77fbdc965
Merge remote-tracking branch 'jordan-ayers/bugfix/2400'
2015-02-25 20:14:33 +01:00
dteviot
931c95d0b1
workaround for not building on Linux version of Travis.
2015-02-26 06:17:29 +13:00
dteviot
9d61457956
AddOn files can be checked if game file is checked, but dependencies do not exist.
2015-02-25 20:54:52 +13:00
Jordan Ayers
659a8ba279
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash on confiscating items if a prison marker cannot be found.
2015-02-24 21:10:01 -06:00
Jordan Ayers
691ebd2372
Correction to teleportation changes.
...
OMW Bug #2400
Related to OMW Bug #1533
Don't crash when finding the closest marker to an exterior position.
2015-02-24 20:51:57 -06:00
Bret Curtis
5672c86924
Rename window title for OpenMW-CS
2015-02-24 23:37:53 +01:00
scrawl
24de6ba27e
Fix crash for LAND records without data
2015-02-24 21:42:40 +01:00
Marc Zinnschlag
e103262095
updated credits file
2015-02-24 18:15:41 +01:00
dteviot
cc815c63f1
Fix: no longer loose changes when run install wizard or iniimport.
2015-02-24 20:14:18 +13:00
dteviot
6878e317a7
launcher: decouple Combo Box model from Plug-ins model.
...
fixes bug reported by scrawl
1. openmw.cfg had content files in order 'Bloodmoon.esm, Tribunal.esm, Morrowind.esm'
2. Blank_ESM_2.0.esm is in the Data Files directory
3. Do an ini file import.
4. Imported profile will have Blank_ESM_2.0.esm as the game file. Should be Morrowind.esm.
Root cause: Game File combo box and Plugins Grid shared same data model, so changing plug-in file order also changed order of Game File combo box.
2015-02-24 20:06:06 +13:00
Marc Zinnschlag
da9bd09a8c
Merge remote-tracking branch 'miroslavr/master'
2015-02-23 20:53:44 +01:00
Marc Zinnschlag
9109162030
Merge remote-tracking branch 'scrawl/master'
2015-02-23 20:51:18 +01:00
scrawl
77bb77b367
Fix for instant restore effects ( Fixes #2392 )
2015-02-23 19:07:12 +01:00
dteviot
63af9d848a
Add constraint: Bloodmoon.esm requires Tribunal.esm.
2015-02-23 19:58:31 +13:00
