PlutonicOverkill
5ec97811d8
Don't switch pages when right-clicking on list
2017-05-12 20:22:18 +12:00
PlutonicOverkill
7281e8b888
Remove C++11 features
2017-05-12 12:48:25 +12:00
PlutonicOverkill
cd75c5618c
Move context menu code to PageBase
2017-05-11 19:46:51 +12:00
PlutonicOverkill
16f8341de3
Prevent context menu appearing for modifier settings
2017-05-10 21:24:12 +12:00
PlutonicOverkill
c2f427f48d
Prevent context menu appearing when right-clicking shortcut setting
2017-05-10 20:43:52 +12:00
PlutonicOverkill
646ff72cdc
Add a more elegant way of showing the context menu
2017-05-10 20:27:50 +12:00
PlutonicOverkill
bd9f657603
Show context menu when user clicks on empty space
2017-05-10 19:51:43 +12:00
PlutonicOverkill
30af92f575
Fix pointer initialisation bug
2017-05-09 20:58:32 +12:00
PlutonicOverkill
4879405097
Add reset context menu for key binding pages
2017-05-09 19:58:34 +12:00
PlutonicOverkill
3545cfa00a
Rewrite feature to reset options to default
2017-05-09 19:50:16 +12:00
Allofich
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
2017-05-08 19:55:54 +09:00
Andrei Kortunov
de14e9811d
Fixed Travis CI build
2017-05-08 11:16:03 +04:00
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
scrawl
3c9f3a0f7f
Merge pull request #1242 from Allofich/warnings
...
Fix AppVeyor warnings
2017-03-29 07:28:00 +02:00
scrawl
6a745cb2cc
Fix text colorMode (Bug #3815 ) and render bin
2017-03-29 07:10:55 +02:00
Andrei Kortunov
edadcb338c
Savegame dialog improvements
2017-03-27 23:10:57 +04:00
scrawl
9e7ade4ba4
Merge pull request #1244 from akortunov/develop
...
MyGUI vertical alignment
2017-03-27 20:14:09 +02:00
Allofich
db2f97f308
Fix shadowing warning
2017-03-27 20:22:20 +09:00
Andrei Kortunov
7d09a5d644
Progress bars vertical alignment
2017-03-27 13:33:28 +04:00
scrawl
a036a98fd0
Merge pull request #1243 from akortunov/develop
...
Journal improvements
2017-03-27 02:56:35 +02:00
scrawl
b064dd29cc
Fix reset of blend function (Bug #3811 )
2017-03-27 02:51:23 +02:00
Andrei Kortunov
658ab5e941
Minor journal improvements
2017-03-26 22:56:36 +04:00
scrawl
2a74f79bf1
Merge pull request #1240 from Allofich/follow
...
Adjust AI follow distances
2017-03-26 20:35:11 +02:00
Allofich
6253a5218e
Adjust AI follow distances
...
(Fixes #3225 )
2017-03-27 03:31:25 +09:00
scrawl
0a061d45b7
Merge pull request #1239 from akortunov/projectilefix
...
Disable explosion effect for 0-range projectiles (bug #3730 )
2017-03-26 20:30:43 +02:00
Rob Cutmore
77bf1efc1a
Editor: Fix labels for creator user inputs
2017-03-26 09:14:32 -04:00
Rob Cutmore
8d4441bb5e
Editor: document subclasses without ID checks
...
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
2017-03-26 09:05:05 -04:00
Andrei Kortunov
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
2017-03-25 22:40:11 +04:00
Andrei Kortunov
860b556713
Disables explosion effect for 0-range projectiles ( fixes #3730 )
2017-03-25 19:53:24 +04:00
MiroslavR
da6b28eb40
Fix selling success chance ( Fixes #3802 )
2017-03-25 15:21:16 +01:00
scrawl
97dbd07ed2
Merge pull request #1236 from akortunov/guifixes
...
Minor GUI fixes
2017-03-25 13:36:58 +01:00
Andrei Kortunov
7bd0c74aa8
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801 )
2017-03-25 14:15:16 +04:00
Andrei Kortunov
e383e4d023
Disabled hit overlay for damage/absorb mana/fatigue spells
2017-03-25 14:10:19 +04:00
scrawl
373bd78cf3
Merge pull request #1233 from akortunov/guifixes
...
Vanilla style drowning widget
2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27
Vanilla style drowning widget (partially fixes bug #3801 ).
2017-03-24 09:41:18 +04:00
scrawl
338592b99b
Don't clear the animation queue when turning (Bug #3581 )
...
Otherwise, the turnAnimationThreshold would make it difficult to estimate when we can start playing the animation.
2017-03-23 20:05:06 +01:00
scrawl
a5d7b36c28
Don't clear idle animation when movement ends (Bug #3581 )
...
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
2017-03-23 20:05:05 +01:00
scrawl
c611ddba8d
Remove stray term
2017-03-23 20:05:05 +01:00
scrawl
f230df3d1c
Merge pull request #1232 from akortunov/tooltipfix
...
Tooltip maximum width cap
2017-03-23 17:12:36 +01:00
Andrei Kortunov
1a47b9727b
Changed tooltip maximum width (bug #3800 )
2017-03-23 14:31:01 +04:00
scrawl
02c6c1897e
Merge pull request #1230 from Allofich/stats
...
Change bounds behavior of stat script commands
2017-03-22 20:22:45 +01:00
scrawl
7075a3a99b
Merge pull request #1231 from Allofich/tooltips
...
Show names on combat actors when RMB GUI is active
2017-03-22 20:21:58 +01:00
Allofich
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
2017-03-22 20:04:29 +09:00
Allofich
57aeec59d5
Change bounds behavior of stat script commands
...
Fixes (#3776 )
2017-03-22 15:17:44 +09:00
Rob Cutmore
3714c2a0f2
Editor: add ID validator to pathgrid input
2017-03-21 08:14:04 -04:00
Rob Cutmore
207695e094
Editor: switch input for pathgrid creator
...
Switched from QComboBox to DropLineEdit for pathgrid creator input.
This allows the input the use auto-complete and be a drop target from
the cells table.
2017-03-21 07:58:01 -04:00
Rob Cutmore
0dcb6a9bd4
Editor: update pathgrid creator input on changes
...
When data changes the cell input for pathgrid creator is repopulated
with valid choices. This handles the case where a cell is added or
removed, and also when a cell's pathgrid is added or completely
removed.
2017-03-18 10:20:16 -04:00
Rob Cutmore
491fd3d0be
Editor: set combo box events for pathgrid creator
...
- Handles when combo box should automatically gain or lose focus.
- Checks user input when combo box selection changes.
2017-03-18 09:20:14 -04:00
Rob Cutmore
95d164a6e6
Editor: use combo box when creating pathgrids
...
Instead of using QLineEdit for user input, use a QComboBox populated
with valid choices. This prevents user from being able to create a
pathgrid for a non-existent cell.
2017-03-18 07:49:46 -04:00
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
Andrei Kortunov
eb81ab5b24
Disables weapon and spells cycling in GUI mode (bugs #2409 , #2483 , #2645 )
2017-03-15 17:07:25 +04:00
