Marc Zinnschlag
|
455684981c
|
Merge remote-tracking branch 'scrawl/master'
|
2015-03-03 11:08:15 +01:00 |
|
cc9cii
|
66ef9d237c
|
Another try to make it work with gcc/travis.
|
2015-03-03 10:12:40 +11:00 |
|
scrawl
|
f09cbfb167
|
Add a comment
|
2015-03-02 23:29:33 +01:00 |
|
scrawl
|
666248618e
|
Fix reference cell movement leaving behind deleted Ptrs for script access
|
2015-03-02 23:20:59 +01:00 |
|
cc9cii
|
7c0f5b72c5
|
Add enum namespace to workaround travis.
|
2015-03-03 08:31:06 +11:00 |
|
scrawl
|
f6509fe53e
|
Another crash fix for land record without data
|
2015-03-02 22:23:00 +01:00 |
|
scrawl
|
8eb1f4e70e
|
Remove more log spam
|
2015-03-02 22:13:50 +01:00 |
|
cc9cii
|
a8427c2efb
|
Do not add NAME subrecords while saving magic effects or scripts.
|
2015-03-03 07:36:11 +11:00 |
|
scrawl
|
e3f1cb8305
|
Remove "loading cell" message
This spams the log too much, in particular when loading a savegame.
|
2015-03-02 21:12:21 +01:00 |
|
scrawl
|
653ddd3f25
|
Warning fix
|
2015-03-02 20:16:11 +01:00 |
|
Marc Zinnschlag
|
8b84fa5579
|
Merge remote-tracking branch 'scrawl/master'
|
2015-03-02 20:01:31 +01:00 |
|
Marc Zinnschlag
|
928bb234ce
|
Merge remote-tracking branch 'cc9cii/editor-gamefiles'
|
2015-03-02 19:57:46 +01:00 |
|
scrawl
|
730138035d
|
Cycle infinite loop fix (Fixes #2421)
|
2015-03-02 17:25:26 +01:00 |
|
scrawl
|
191c0104f6
|
Crash fix for creatures with no skeleton base (Fixes #2419)
|
2015-03-02 15:19:57 +01:00 |
|
scrawl
|
a653716e2c
|
Fix for damage/restore effects using the instant apply path when they have a duration
|
2015-03-01 22:22:20 +01:00 |
|
cc9cii
|
1ee6153940
|
Remove unnecessary boolean passing between objects.
|
2015-03-02 06:51:31 +11:00 |
|
scrawl
|
239c0071f5
|
Armor tooltip should show the effective armor rating
|
2015-03-01 19:40:38 +01: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 |
|
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 |
|
cc9cii
|
c4625b94e5
|
Fix OpenCS crashing since commit 9d6145 by showing gamefiles if the content selector was created from OpenCS.
|
2015-03-01 12:52:43 +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
|
2f2a95f735
|
Fix crash for terrain without data, part 2
|
2015-02-28 19:33:49 +01:00 |
|
scrawl
|
f82751422d
|
Fix constant effect restore enchantments being applied incorrectly (Fixes #2408)
|
2015-02-28 16:31:22 +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 |
|
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
|
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 |
|
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 |
|