Koncord
ca7f3f7450
[Client] Disable focus on <tab> for chat window
2017-11-07 11:44:08 +08:00
Koncord
f377164db9
[Client] Fix build
2017-11-07 05:35:23 +08:00
Koncord
d15c674584
[General] Move getFilenameTimestamp() to Utils
2017-11-07 05:33:10 +08:00
David Cernat
61db22f5ae
Merge pull request #329 from TES3MP/master
...
Add master commits up to 31 Oct 2017
2017-10-31 06:31:49 +02:00
David Cernat
a31d43965f
Merge pull request #328 from OpenMW/master
...
Add OpenMW commits up to 31 Oct 2017
2017-10-31 06:22:57 +02:00
Miloslav Číž
3c65bdaf14
weapon cycle fix
2017-10-30 18:05:45 +01:00
Miloslav Číž
03401bb5df
remove redundant condition
2017-10-27 20:19:20 +02:00
Koncord
3495fd43f4
[Client] Add network statistics (CTRL+F2)
2017-10-28 00:39:46 +08:00
Koncord
e8915f8ec5
[Client] Fix build
2017-10-27 01:33:01 +08:00
David Cernat
b801cf2c9e
Merge pull request #327 from TES3MP/master
...
Add master commits up to 26 Oct 2017
2017-10-26 17:34:00 +03:00
David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
2017-10-26 17:28:56 +03:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
David Cernat
76a4abd7c0
Merge pull request #325 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
2017-10-24 19:45:11 +03:00
David Cernat
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
2017-10-24 19:36:14 +03:00
scrawl
4437a72e47
Merge pull request #1519 from drummyfish/rainfix
...
fix rain ripple regression (bug #4169 )
2017-10-24 15:31:16 +00:00
Miloslav Číž
3731e20228
fix rain ripple regression
2017-10-24 14:12:41 +02:00
scrawl
0c6ef17fb5
Add explicit variant of 'OnActivate'
2017-10-23 23:33:06 +00:00
scrawl
e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24
Hide modal window before deleting it ( Fixes #4168 )
2017-10-23 23:33:05 +00:00
David Cernat
360cf2ead7
Merge pull request #321 from OpenMW/master
...
Add OpenMW commits up to 22 Oct 2017
2017-10-23 14:51:29 +03:00
scrawl
8b19a8b7f6
Merge pull request #1513 from lukago/feature4082b
...
Feature #4082 : use many ingredients/potions instantly
2017-10-22 20:51:14 +00:00
scrawl
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
2017-10-22 20:50:15 +00:00
scrawl
768da57da2
Fix dialogue topics displayed in lower case
2017-10-22 20:50:15 +00:00
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
2017-10-22 20:27:44 +03:00
lukago
b6cb3b445c
use getIndex to handle other windows, nullsafe fixes
2017-10-21 23:34:57 +02:00
scrawl
bb4ffb7743
Merge pull request #1514 from akortunov/ringfix
...
Do not replace an equpped ring of the same value
2017-10-21 13:35:55 +00:00
scrawl
075a7fee20
Merge pull request #1515 from akortunov/guifixes
...
Fix a 'Good Beast' companion window
2017-10-21 13:35:29 +00:00
scrawl
5b2fe01375
Merge pull request #1508 from AnyOldName3/shut-up-travis
...
Mark worldimp functions as override to stop distracting Travis CI war…
2017-10-21 13:34:48 +00:00
Andrei Kortunov
eaff7e30aa
Fix a 'Good Beast' companion window
2017-10-21 16:56:21 +04:00
Andrei Kortunov
e64f14b7ce
Do not replace an equpped ring of the same value
2017-10-20 23:05:12 +04:00
lukago
a3225364ff
refactor, use dragItem method
2017-10-19 17:43:27 +02:00
AnyOldName3
03fc3353b9
Tidy up indentation 2
2017-10-19 16:34:50 +01:00
AnyOldName3
f3e6b26e6b
Tidy up indentation
2017-10-19 16:34:11 +01:00
lukago
43f94a8890
simplify drag and drop on avatar for potions and ingredients
2017-10-19 16:50:04 +02:00
Rhiyo
d9fe3aac99
fixed new clothing replacing old clothing of same value
...
Found on the bug http://bugs.openmw.org/issues/4165 .
In original Morrowind, new clothing of the same value wouldn't replace old clothing. Tested with common and expensive clothing by selling to merchants and using the AddItem console command in original Morrowind.
In OpenMW, before this change, new clothing of the same value would replace old clothing, tested with the same methods used above.
2017-10-19 22:46:08 +10:30
AnyOldName3
2abff22c08
Make MWWorld::World final to enable compiler optimisations
2017-10-18 13:48:31 +01:00
AnyOldName3
7440cf37bc
Remove redundant virtual keywords implied by override keywords
2017-10-18 13:37:37 +01:00
David Cernat
6e7c033a5d
Merge pull request #318 from TES3MP/master
...
Add master commits up to 18 Oct 2017
2017-10-18 15:14:37 +03:00
David Cernat
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
2017-10-18 15:13:48 +03:00
AnyOldName3
69da89be39
Mark a method I missed out the first time as override
2017-10-18 13:05:04 +01:00
scrawl
33ceddc58b
Merge pull request #1506 from akortunov/swimanimations
...
Use SwimTurnLeft/Right animations correctly
2017-10-18 10:03:30 +00:00
scrawl
21a705fb75
Merge pull request #1507 from AnyOldName3/data-local-fix
...
Fix the loading of 'data-local' lines which I broke
2017-10-18 09:59:43 +00:00
scrawl
7328de6c50
Merge pull request #1505 from drummyfish/master
...
Make snow create water ripples (fixes #4156 )
2017-10-18 09:59:21 +00:00
AnyOldName3
2aad5bed7a
Mark worldimp functions as override to stop distracting Travis CI warnings and prevent future typos
2017-10-18 05:06:09 +01:00
AnyOldName3
1f77f9654b
Strip quotes from the data-local setting if present (because for whatever reason it's a string, not a boost::filesystem::path)
2017-10-18 01:42:11 +01:00
Andrei Kortunov
4d4d247565
Use SwimTurnLeft/Right animations correctly
2017-10-17 23:26:55 +04:00
Miloslav Číž
a7cad65aab
fix water shader switching bug
2017-10-17 10:00:01 +02:00
Miloslav Číž
8a1e0e74fd
update uniform from one place
2017-10-17 09:59:53 +02:00
Miloslav Číž
797e407269
make snow create water ripples
2017-10-17 09:59:53 +02:00
Miloslav Číž
da47653625
move rain intensity uniform to water node
2017-10-17 09:59:45 +02:00
