Marc Zinnschlag
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
2015-03-14 14:25:49 +01:00
Rohit Nirmal
2540a901d5
Remove unused variable.
2015-03-13 20:04:47 -05:00
cc9cii
4d46d7ba72
Fix some compiler warnings.
2015-03-14 06:07:12 +11:00
Marc Zinnschlag
f0a7b202b9
Merge branch 'openmw-35-1'
2015-03-13 17:33:08 +01:00
Marc Zinnschlag
056bc66c6c
Merge remote-tracking branch 'scrawl/master'
2015-03-12 10:29:39 +01:00
scrawl
767624f518
Combat mechanic fixes
2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3
Update hit chance according to wiki and implement fCombatInvisoMult
2015-03-12 02:47:16 +01:00
scrawl
f603a68144
Allow binding Hand To Hand in quick keys menu ( Fixes #2024 )
2015-03-12 02:23:46 +01:00
scrawl
7fd1c2c2e2
CharacterCreation refactoring
2015-03-12 00:43:28 +01:00
scrawl
d00c75d428
Remove more outdated TODO comments.
2015-03-12 00:37:28 +01:00
scrawl
3879ce6ac1
Get rid of "player" string checks ( Fixes #2216 )
2015-03-11 23:07:39 +01:00
scrawl
68de876051
Switch to weapon drawstate when creating a bound weapon ( Fixes #2387 )
2015-03-11 21:12:08 +01:00
scrawl
48ea6286fd
Book/scroll window refactoring
2015-03-11 20:33:55 +01:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
2015-03-11 10:54:45 -04:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
scrawl
457c135097
Remove old workaround
2015-03-09 03:15:11 +01:00
scrawl
36e1b6cc48
Support fatigue below zero for the Drain effect ( Fixes #2430 )
2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190
Adjust fix for maximum attribute damage limit
2015-03-09 03:15:11 +01:00
Ivy Foster
4f100e6870
Fix rapid toggling when holding sneak button.
2015-03-08 16:08:45 -05:00
Ivy Foster
ba7fc8609c
Add toggle sneak option; fix bug #2119
...
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.
Outstanding issues:
- In toggle sneak mode, holding the Sneak button causes
rapid, repeated toggling.
- The button in the settings menu doesn't do anything.
2015-03-08 15:23:46 -05:00
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
2015-03-08 18:29:12 +13:00
dteviot
f19863b545
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 18:11:54 +13:00
dteviot
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
2015-03-08 13:22:56 +13:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
2015-03-07 18:34:29 +01:00
scrawl
58807064b4
Revert "Fix reference cell movement leaving behind deleted Ptrs for script access"
...
This reverts commit 666248618e
2015-03-07 15:31:21 +01:00
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13:00
dteviot
27f91a8326
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-06 19:47:46 +01:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
dteviot
407cd50890
fixed warning C4099:
...
type name first seen using 'class' now seen using 'struct'
2015-03-06 21:36:42 +13:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
dteviot
80fe24207c
correction from Scrawl.
...
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
2015-03-05 20:21:22 +13:00
Marc Zinnschlag
9f155df761
Merge remote-tracking branch 'maqifrnswa/bug2407' into openmw-35-1
2015-03-04 17:09:13 +01:00
Marc Zinnschlag
2e31f01585
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-04 16:55:46 +01:00
scrawl
cced508916
Remove unintended 1.5 factor for damage/restore magic effects
2015-03-04 01:49:00 +01:00
scrawl
8931ddf428
Remove unneeded casts
2015-03-03 23:46:53 +01:00
Scott Howard
d01e8cc97d
PositionCell/PlaceItemCell: add console message if cell doesn't exist
2015-03-03 17:36:22 -05:00
Marc Zinnschlag
c66bf41ac2
Merge remote-tracking branch 'scrawl/master' into openmw-35-1
2015-03-03 18:23:38 +01:00
Marc Zinnschlag
bf92d5cde9
removed redundant mScript field in ESM::StartScript
2015-03-03 13:04:57 +01:00
Marc Zinnschlag
3b8d709583
Merge remote-tracking branch 'maqifrnswa/bug2407'
2015-03-03 11:26:25 +01:00
scrawl
a8cb4e807b
Warning fix
2015-03-03 11:24:23 +01: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
scrawl
8eb1f4e70e
Remove more log spam
2015-03-02 22:13:50 +01: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
