Andrei Kortunov
|
4bb9622c21
|
Handle greetings differently from responses
|
2017-06-08 22:40:31 +04:00 |
|
scrawl
|
59eb0aba7d
|
Merge pull request #1310 from akortunov/guifixes
Removed empty space before dialogue entry (bug #3892)
|
2017-06-07 21:55:45 +02:00 |
|
Andrei Kortunov
|
c2962ced90
|
Removed empty space before dialogue entry (bug #3892)
|
2017-06-04 23:20:43 +04:00 |
|
scrawl
|
172cc65be9
|
Merge pull request #1308 from akortunov/spellpriority
Spell priority: dispel usage improvements
|
2017-06-04 12:49:53 +02:00 |
|
Andrei Kortunov
|
00402b7154
|
Removed unused variable
|
2017-06-04 14:09:23 +04:00 |
|
scrawl
|
70e02f4c28
|
Merge pull request #1306 from Nialsy/master
Fixed quickload with menus open
|
2017-06-04 11:18:49 +02:00 |
|
Andrei Kortunov
|
f4a187a9c2
|
Move a setting to show enchanting success chance from GUI to Game section
|
2017-06-03 23:03:24 +04:00 |
|
Andrei Kortunov
|
9a1ba1e559
|
Show success chance when self-enchanting (Feature #3492)
|
2017-06-03 14:39:15 +04:00 |
|
Andrei Kortunov
|
42f3c73c75
|
Spell priority: dispel usage improvements
|
2017-06-03 13:16:44 +04:00 |
|
Nicholas
|
f6f07f5497
|
clear mGoToJail flag on load
|
2017-06-02 13:33:47 -05:00 |
|
scrawl
|
9fd0d54a35
|
Merge pull request #1289 from akortunov/newrepair
Improved repair and recharge widgets
|
2017-05-31 22:47:38 +02:00 |
|
Andrei Kortunov
|
f6c3d4935e
|
Spell priority: feather and burden
|
2017-05-31 19:23:44 +04:00 |
|
Andrei Kortunov
|
10d4cb15ad
|
Improved repair widget
|
2017-05-31 19:11:49 +04:00 |
|
Andrei Kortunov
|
1164c3f16e
|
Improved recharge widget
|
2017-05-31 19:11:49 +04:00 |
|
Andrei Kortunov
|
6c21e4ed31
|
Spell priority: ignore some effects useless in battle
|
2017-05-31 18:41:41 +04:00 |
|
scrawl
|
2638327593
|
Merge pull request #1303 from akortunov/guifixes
Character generation layout fixes
|
2017-05-31 15:25:41 +02:00 |
|
scrawl
|
a1661af864
|
Merge pull request #1301 from akortunov/tooltips
Tooltips layout fixes
|
2017-05-29 00:13:34 +02:00 |
|
Andrei Kortunov
|
46c8842808
|
Fixed enchant points calculations formula
|
2017-05-26 23:42:11 +04:00 |
|
Andrei Kortunov
|
f17badb3cd
|
Makes cells cache size configurable
|
2017-05-25 13:09:40 +04:00 |
|
scrawl
|
f9cdc2da94
|
Merge pull request #1293 from akortunov/spellpriority
aicombataction.cpp: implement some spell priority TODO's
|
2017-05-21 21:18:10 +02:00 |
|
MiroslavR
|
98daf4f043
|
Merge pull request #1296 from akortunov/jumpfatiguefix
Fixed jump fatigue loss formula (bug #3843)
|
2017-05-21 11:47:58 +02:00 |
|
scrawl
|
8cd8eab9dd
|
Merge pull request #1294 from akortunov/constenchantfix
Swap enchant type when purge selected soulgem (bug #3878)
|
2017-05-20 23:44:14 +02:00 |
|
Andrei Kortunov
|
4f41c44cd6
|
Swap enchant type when clean selected soulgem widget (fixes #3878)
|
2017-05-20 18:30:11 +04:00 |
|
Allofich
|
315ad54b29
|
Don't make NPCs or player speak while underwater
(Fixes #3851)
|
2017-05-08 19:55:54 +09: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Andrei Kortunov
|
df5a43363a
|
Confirmation dialogs size fix
|
2017-03-30 17:05:56 +04:00 |
|
scrawl
|
3c9f3a0f7f
|
Merge pull request #1242 from Allofich/warnings
Fix AppVeyor warnings
|
2017-03-29 07:28:00 +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 |
|