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
6f878327bf
Fix unused ICS_MAX warning
2017-06-04 12:50:25 +02: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
d6b97604ba
Update AUTHORS.md
2017-06-04 11:19:28 +02:00
scrawl
70e02f4c28
Merge pull request #1306 from Nialsy/master
...
Fixed quickload with menus open
2017-06-04 11:18:49 +02:00
scrawl
305f5af4a6
Merge pull request #1309 from akortunov/enchantchance
...
Move a setting to show enchanting success chance to Game section
2017-06-03 22:17:41 +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
scrawl
516e99c6e7
Merge pull request #1305 from akortunov/enchantchance
...
Show success chance when self-enchanting
2017-06-03 15:19:12 +02:00
Andrei Kortunov
9a1ba1e559
Show success chance when self-enchanting (Feature #3492 )
2017-06-03 14:39:15 +04:00
scrawl
9032443272
Merge pull request #1307 from nikolaykasyanov/fix-macos-ci
...
Fix macOS CI
2017-06-03 11:21:46 +02:00
Andrei Kortunov
42f3c73c75
Spell priority: dispel usage improvements
2017-06-03 13:16:44 +04:00
Nikolay Kasyanov
224fcc9a4a
[macOS, CI] Fix dependency installation
2017-06-03 10:42:49 +02: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
scrawl
4a9a741905
Merge pull request #1304 from akortunov/spellpriority
...
Combat AI: spell priority fixes
2017-05-31 22:47:28 +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
Andrei Kortunov
2b28d1a6d2
Select specialization menu layout fix
2017-05-30 17:15:10 +04:00
scrawl
a1661af864
Merge pull request #1301 from akortunov/tooltips
...
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
scrawl
7f5b88bbc6
Merge pull request #1300 from akortunov/enchantformula
...
Fixed enchant points calculations formula
2017-05-28 23:54:05 +02:00
scrawl
d39da2b755
Merge pull request #1302 from hasufell/master
...
Fix build with osg >= 3.5.6
2017-05-28 23:07:48 +02:00
Julian Ospald
5d85fa9220
Fix build with osg >= 3.5.6
2017-05-28 17:30:01 +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
Bret Curtis
4c27e2f2d9
Merge pull request #1292 from rhtucker/master
...
Converted all settings files to semantic linefeeds.
2017-05-15 11:53:10 +02:00
Ryan Tucker
d555c21c28
Converted all settings files to semantic linefeeds.
...
Corrected default segments in Windows settings.
Removed all default declarations in the prose of the setting descriptions except where clarification or additional information was also provided.
Some minor, but not thorough grammar corrections.
2017-05-14 22:04:20 -07:00
Marc Zinnschlag
6906e35ac0
Merge remote-tracking branch 'origin/master'
2017-05-12 14:48:03 +02:00
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
scrawl
5e03e75549
Merge pull request #1283 from Allofich/water
...
Don't make NPCs or player speak while underwater
2017-05-09 08:16:06 +02:00
Allofich
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
2017-05-08 19:55:54 +09:00
Bret Curtis
2f866fadcf
Merge pull request #1288 from akortunov/travisfix
...
Fixed Travis CI build (removed tab from test_stringops.cpp)
2017-05-08 10:57:00 +02:00
