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
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
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
Bret Curtis
c262ae9279
Merge pull request #1285 from ace13/patch-5
...
Update Windows CI scripts to use ffmpeg 3.2.4
2017-05-06 13:28:49 +02:00
PlutonicOverkill
64879c03e4
Add option to reset settings to default
2017-05-06 20:18:31 +12:00
Alexander "Ace" Olofsson
fd03c76e68
And apparently they're only doing zips now
2017-05-06 09:38:14 +02:00
Alexander "Ace" Olofsson
ae05c37a46
Update Windows CI scripts to use ffmpeg 3.2.4
2017-05-06 09:21:02 +02:00
scrawl
8d84869432
Fix commit 8f71b65d38 (don't overwrite the previous user data)
...
This resulted in a crash/corruption because the KeyframeController, for performance reasons, does not check that the expected user data is there and of correct type.
(Fixes #3829 )
2017-05-05 05:27:00 +02: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
