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 |
|