PlutonicOverkill
f30d1a3075
Revert everything
2017-05-08 17:24:28 +12:00
scrawl
48c764a580
Update test
2017-05-07 23:31:06 +02:00
scrawl
813af876f6
Use a partial binary search in isReservedName ( Fixes #3835 )
2017-05-07 23:28:56 +02:00
scrawl
109bc3cb59
Merge pull request #1281 from akortunov/purgefix
...
Make InventoryStore::purgeEffect() purge all effects with argument ID instead only first
2017-05-07 21:08:30 +02:00
scrawl
796d2c59ca
Merge pull request #1282 from MiroslavR/noenv_player_vo
...
Do not apply underwater effects to player's voice
2017-05-07 21:07:19 +02:00
PlutonicOverkill
a9760ec805
Fix indenting
2017-05-07 17:07:58 +12:00
PlutonicOverkill
d8a711f89f
Fix tabs
2017-05-07 17:05:50 +12:00
PlutonicOverkill
477af73ad6
Missed another one
2017-05-07 17:00:26 +12:00
PlutonicOverkill
418aeb65f1
Remove unneeded dependencies
2017-05-07 16:58:15 +12:00
PlutonicOverkill
5fca37d0c8
Forgot to remove debugging code
2017-05-07 16:54:38 +12:00
PlutonicOverkill
dff3828710
Keep the settings page in sync with the real settings
2017-05-07 16:51:11 +12:00
PlutonicOverkill
64879c03e4
Add option to reset settings to default
2017-05-06 20:18:31 +12:00
Marc Zinnschlag
a2e863e7dd
Merge remote-tracking branch 'origin/master'
2017-05-03 14:31:21 +02:00
Andrei Kortunov
4d927439ca
Spell priority: item wearing check when disintegrate weapon/armor
2017-05-03 11:13:35 +04:00
Andrei Kortunov
d598809ac6
Spell priority: check spell resistance, check if actor is already has a non-magnitude effect
2017-05-03 10:35:56 +04:00
PlutonicOverkill
829560719e
Make name highlighting more consistent and only for variable names
2017-05-02 17:28:42 +12:00
Andrei Kortunov
1520a4d7db
Levelup menu layout fixes
2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0
Tooltips: faction, magic effects layout fixes
2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
2017-04-30 22:39:05 +04:00
MiroslavR
d24bcbac15
Do not apply underwater effects to player's voice ( Fixes #3850 )
2017-04-30 18:51:49 +02:00
Andrei Kortunov
6331cc6ab9
Tooltips: level, race, class, specialization layout fixes
2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da
Merge pull request #1272 from akortunov/guifixes
...
Service menus layout fixes
2017-04-30 12:27:21 +02:00
PlutonicOverkill
95f60d2bb3
Merge branch 'master' into mark-variable
2017-04-28 20:15:48 +12:00
PlutonicOverkill
cbb2b8b119
Add setting so feature can be turned off
2017-04-28 19:57:49 +12:00
PlutonicOverkill
a8e7628e83
Enable highlighting when cursor is placed over a name (script editor)
2017-04-28 19:28:05 +12:00
Marc Zinnschlag
7919c4d672
Merge remote-tracking branch 'plutonicoverkill/master'
2017-04-28 08:40:07 +02:00
PlutonicOverkill
e685de0f84
Fix script editor undo/redo context menu actions
2017-04-27 19:48:01 +12:00
PlutonicOverkill
6063d8e31b
Fix existing context menu in script editor
2017-04-27 16:31:45 +12:00
Andrei Kortunov
f484ef8ffb
Fixed jump fatigue loss formula ( fixes #3843 )
2017-04-26 18:28:59 +04:00
Andrei Kortunov
bba822c014
Purge all effects with same ID instead only first ( fixes #3839 )
2017-04-26 17:18:06 +04:00
Marc Zinnschlag
61e6b0d03c
improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault)
2017-04-26 15:03:30 +02:00
PlutonicOverkill
3d1e640388
Add setting to change keyboard shortcut and fix another crash
2017-04-26 19:42:03 +12:00
PlutonicOverkill
1f699552f7
Fix infinite recursion bug in uncommentSelection()
2017-04-26 15:49:39 +12:00
PlutonicOverkill
61e374fdfc
Implement commentSelection() and uncommentSelection()
2017-04-25 19:12:18 +12:00
PlutonicOverkill
83ff7d162c
Add comment/uncomment actions to the context menu
2017-04-25 16:12:59 +12:00
MiroslavR
eada8c6822
Fix wrong incrementation in InventoryStore::visitEffectSources ( Fixes #3838 )
2017-04-23 18:05:41 +02:00
Andrei Kortunov
c2706ac3e7
Merchant repair and travel window scroll fix
2017-04-23 09:15:25 +04:00
scrawl
0e37e71ea2
Merge pull request #1266 from akortunov/handsfallbackfix
...
Improved hands bodyparts selection fallback
2017-04-23 00:36:48 +02:00
Andrei Kortunov
4544caf7f3
Improved bodypart select fallback ( fixes #2594 )
2017-04-22 22:23:10 +04:00
MiroslavR
0737d6cb72
Merge pull request #1270 from Allofich/scriptfix
...
Check for NULL before running voice dialogue scripts
2017-04-22 01:58:20 +02:00
Allofich
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
2017-04-22 07:51:31 +09:00
scrawl
8fbf9dc597
Merge pull request #1253 from akortunov/pinned
...
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f
Move updatePinnedWindows() function to private section
2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa
Remove unused code
2017-04-21 18:39:01 +04:00
Allofich
143ee387cc
Add enabled check to animation script commands
...
(Fixes #3793 )
2017-04-21 23:27:24 +09:00
scrawl
fc56fc0b81
Merge pull request #1265 from akortunov/develop
...
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
scrawl
2c879ddbbf
Merge pull request #1264 from Allofich/script
...
Run scripts for voiced dialogue
2017-04-21 15:26:09 +02:00
Andrei Kortunov
e717d046f2
Escaped class name string
2017-04-21 17:21:57 +04:00
scrawl
1956602aa2
Merge pull request #1262 from Allofich/warnings
...
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce
Use sLevel GMST instead of hardcoded text in load game menu
2017-04-21 09:40:25 +04:00
Andrei Kortunov
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f
Fix shadowing warnings
2017-04-21 11:06:18 +09:00
Allofich
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
2017-04-21 10:39:11 +09:00
scrawl
c2240e3af1
Call the WindowManager::updatePlayer after the startup script is run
2017-04-21 00:51:13 +02:00
scrawl
1ffb9e1bf3
Remove renderWorldMap()
2017-04-21 00:50:22 +02:00
scrawl
bfdde0262f
Merge pull request #1260 from akortunov/levitationfix
...
Purge existing levitation effects when levitation is disabled (fixes #3766 )
2017-04-21 00:25:09 +02:00
Allofich
ff3e307059
Pass parameters by const reference
2017-04-20 23:47:03 +09:00
Andrei Kortunov
90d90b6d81
Fixed dynamic stats tooltips in review menu
2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
2017-04-20 17:20:20 +04:00
Allofich
2e5fd74db0
Fix invalid iterator warning
2017-04-20 19:30:35 +09:00
scrawl
df3b4fe6a5
Merge pull request #1259 from Allofich/warnings
...
Fix a few Cppcheck warnings
2017-04-19 20:32:40 +02:00
Andrei Kortunov
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Allofich
e87d2aa1af
Remove unused function
2017-04-20 01:47:30 +09:00
Allofich
60a2625b89
Add parentheses to clarify calculations
2017-04-20 01:38:21 +09:00
scrawl
30081393a6
Add InventoryWindow::clear() as part of world cleanup
2017-04-19 18:28:49 +02:00
Allofich
f299f26720
Remove unused variable
2017-04-20 01:22:33 +09:00
Allofich
5a00b239ac
Reduce scope of variables
2017-04-20 01:22:30 +09:00
Allofich
c655875584
Change mWaterEnabled from float to bool
2017-04-20 01:09:52 +09:00
Andrei Kortunov
04eb4ea6b6
Check for disabled levitation ( fixes #3766 )
2017-04-19 18:38:25 +04:00
scrawl
50f3794d12
Merge pull request #1258 from akortunov/drownfix
...
Fixed drowning widget initialization with non-default "fHoldBreathTime" GMST value
2017-04-19 16:08:55 +02:00
Andrei Kortunov
3c4c47d1e6
Reduced scope of fHoldBreathTime variable
2017-04-19 15:52:15 +04:00
Andrei Kortunov
c3fd327bb2
Fixed drowning widget initialization
2017-04-19 08:48:16 +04:00
scrawl
f90e5081f9
Merge pull request #1257 from akortunov/chargen
...
Chargen menus fixes
2017-04-18 22:23:30 +02:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
Andrei Kortunov
c93cf822c7
Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628 )
2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4
Save a proto gender in racemenu
2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
17125e6c4d
Merge pull request #1256 from Allofich/equip
...
Adjustments to RemoveItem behavior
2017-04-14 01:08:29 +02:00
Andrei Kortunov
dc036e96d4
fixed magicka calculation on chargen (bug #3694 )
2017-04-13 18:30:36 +04:00
Allofich
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
2017-04-13 22:33:13 +09:00
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
scrawl
d8943d911c
Merge pull request #1254 from Allofich/warning
...
Remove unnecessary line
2017-04-12 23:49:29 +02:00
Allofich
470988f9ef
Minor changes to getActorsSidingWith
2017-04-13 04:45:44 +09:00
Andrei Kortunov
c3d49d5ca5
Fixed inventory crash and skipmenu launch
2017-04-12 22:57:32 +04:00
Allofich
6272e1c674
Cache allies found while iterating engageCombat
...
(Fixes #3814 )
2017-04-13 02:02:38 +09:00
Allofich
5020d03c78
Remove unnecessary line
2017-04-12 22:59:28 +09:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
scrawl
993860a4b1
Merge pull request #1250 from resilar/mapbutton
...
Hide WorldButton when in game mode
2017-04-11 21:34:53 +02:00
scrawl
8f335b3484
Merge pull request #1245 from akortunov/tgm
...
Vanilla-like tgm
2017-04-11 21:34:44 +02:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
scrawl
1cd901d113
Merge pull request #1248 from akortunov/missedsound
...
Adds missing recharge and repair sounds
2017-04-09 21:33:12 +02:00
Rob Cutmore
0ff56677f6
Remove unused code
2017-04-06 19:56:18 -04:00
Rob Cutmore
84bad9316d
Editor: flag orbit camera for re-initialization
...
After swapping cells the orbit cam controller needs to be
re-initialized to properly center on the new cell.
2017-04-06 19:40:26 -04:00
Rob Cutmore
f7664d4bb9
Editor: reset camera after cell drag and drop
...
When replacing a viewed cell via drag and drop the camera position is
not updated to better view the new cell. This flags the camera position
as not being set so a better default is set.
2017-04-04 18:54:58 -04:00
def
785b3c3d01
Hide WorldButton when in game mode
2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334
Added missed recharge and repair sounds
2017-04-02 23:19:43 +04:00
Marc Zinnschlag
ab8294b281
Merge remote-tracking branch 'rcutmore/bug-2838'
2017-03-31 16:47:26 +02:00
Andrei Kortunov
df5a43363a
Confirmation dialogs size fix
2017-03-30 17:05:56 +04:00
Rob Cutmore
343f2cb81d
Editor: add creator for body parts
...
Added creator subclass for body parts to allow adding first person
parts. IDs for first person body parts are expected to end with ".1st".
2017-03-30 08:20:43 -04:00