Marc Zinnschlag
9f0ccdc37a
Merge remote-tracking branch 'scrawl/master'
2015-05-31 11:05:43 +02:00
scrawl
d1b6289cad
Don't teleport followers when using teleportation spells
2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
1b41f6c4c5
Sleep interruption fix
2015-05-16 12:29:26 +02:00
scrawl
5abeab21ed
Various integer/floating point roll adjustments based on wiki
2015-05-11 16:55:09 +02:00
scrawl
58a2ad663c
Fix regression of sleep interruption chance
2015-05-11 16:38:16 +02:00
scrawl
c819180aa1
Minor cleanup
2015-05-11 16:38:16 +02:00
scrawl
3b8b217888
Fix no punishment for stealing when taking an item with the inventory opened
2015-05-11 16:38:16 +02:00
scrawl
033719ccd7
Correct the icon used for custom map markers
2015-05-11 16:38:15 +02:00
scrawl
ca53457a1c
Correct the map icons used for detect spells ( Fixes #2519 )
2015-05-11 16:38:15 +02:00
Marc Zinnschlag
83a7eea2a9
Merge remote-tracking branch 'scrawl/master'
2015-05-03 09:54:32 +02:00
Rohit Nirmal
997347b01e
Silence -Wreorder warnings.
2015-04-28 18:48:02 -05:00
dteviot
fe69dc2863
Made LineInfo a struct, as requested by Scrawl.
2015-04-05 14:56:29 +12:00
dteviot
52de622e97
provide incremental update of SpellWindow ( Fixes #2411 )
...
When SpellWindow is visible, every 0.5 seconds update the cost/changes for spells/enchanted items shown.
Also, check to see if more substantial update of the window is required.
2015-04-03 17:59:13 +13:00
dteviot
6b6bed520d
removed redundant calls.
2015-04-03 13:45:13 +13:00
scrawl
5cb61fa01c
Don't mark gold as stolen, adjust stolen tooltip ( Fixes #2465 )
2015-03-22 17:28:27 +01:00
scrawl
d573458896
Fix case sensitivity bug in default head/hair selection ( Fixes #2453 )
2015-03-16 17:42:15 +01:00
Marc Zinnschlag
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f
consolidate random number logic
...
Note, I suspect Rng::rollClosedProbability() is not needed. The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
2015-03-15 08:49:03 +13: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
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
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01: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
dteviot
f2ac939e61
reverted mShouldRepeat back to unsigned char.
...
As recommended by Scrawl.
2015-03-07 11:04:54 +13: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
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
scrawl
730138035d
Cycle infinite loop fix ( Fixes #2421 )
2015-03-02 17:25:26 +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
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
Marc Zinnschlag
da9bd09a8c
Merge remote-tracking branch 'miroslavr/master'
2015-02-23 20:53:44 +01:00
MiroslavR
47c053444f
Make the jail progress last one second
2015-02-23 00:23:09 +01:00
scrawl
a5847afdac
Fix ignored clicks on HUD mini-map ( Fixes #2388 )
2015-02-20 00:00:13 +01:00
scrawl
6d62aa7544
Don't prompt for spell deletion when using cycling keys ( Fixes #2382 )
2015-02-18 19:06:36 +01:00
scrawl
a139e4efb0
Grey out completed quests in journal quests list
2015-02-13 16:51:34 +01:00
scrawl
3ccf4642b4
Implement ToggleScripts
2015-02-10 20:25:57 +01:00
scrawl
218f789d88
Fix player DrawState reset when selecting enchanted item ( Fixes #2356 )
2015-02-09 20:16:29 +01:00
Marc Zinnschlag
e9d6e4f6df
Merge remote-tracking branch 'ace/include-cleanup'
2015-02-09 18:03:28 +01:00
Alexander "Ace" Olofsson
d3128a12b6
Remove a large include form mwbase/windowmanager.hpp
2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
MiroslavR
1230cf49bf
Properly center jail progress widget, fix a bug with it not disappearing if the console is open
2015-02-07 18:38:41 +01:00
MiroslavR
1d9e973573
Add training progress bar, implement jail screen, tweak wait dialog ( Fixes #1714 )
2015-02-07 04:05:28 +01:00
scrawl
9ce3e4b4e1
UI consistency fix in levelup dialog
2015-02-06 01:27:17 +01:00
scrawl
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
2015-02-06 01:27:17 +01:00
