1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-31 07:45:32 +00:00
Commit graph

3082 commits

Author SHA1 Message Date
David Cernat
baa9446cd1 Add OpenMW commits up to 4 Aug 2020 2020-08-04 17:41:01 +02:00
Frederic Chardon
12ee42c6f3 Update mLastTopic before executing scripts. In case the script contains ClearInfoActor it erase not the correct topic.
Other correction not linked with the bug:
- reset mActorKnownTopicsFlag at the same time as mActorKnownTopics
- don't call updateTopics in addResponse, it is already handled by the response
callback
2020-07-28 20:50:49 +00:00
David Cernat
2cb16e778c [General] Use clearer method name for tracking InterpreterContext type 2020-07-26 20:03:33 +02:00
David Cernat
ff10aa816b Add OpenMW commits up to 25 Jul 2020
# Conflicts:
#   .travis.yml
2020-07-25 19:44:01 +02:00
David Cernat
58d8367cb0 [Client] Handle input from server-sent custom messageboxes less hackily 2020-07-18 01:36:13 +02:00
David Cernat
eb1641dd86 [Client] Fix crashes caused by current modals with invalid widgets 2020-07-17 21:07:09 +02:00
Bret Curtis
a5da59e840
Merge pull request #2967 from Capostrophic/casesensitivity
Fix search filter unicode character case sensitivity
2020-07-12 22:41:24 +02:00
Capostrophic
65ac0c86b8 Fix search filter unicode character case sensitivity 2020-07-12 19:05:47 +03:00
Andrei Kortunov
7f936e4cde
Merge pull request #2961 from akortunov/move
Do not use outdated references when moving objects to new cells
2020-07-12 12:11:22 +04:00
David Cernat
39e429c9eb Add OpenMW commits up to 11 Jul 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
2020-07-11 21:42:01 +02:00
Andrei Kortunov
da791590ac Update HUD icons during mechanics update again to avoid crashes 2020-07-11 20:40:00 +04:00
Andrei Kortunov
db8f0ad6fd Do not use outdated references when moving objects to new cells (bug #5387) 2020-07-11 17:24:20 +04:00
CedricMocquillon
096e25b29a Make the getSkillForTraining a member method of TrainingWindow class.
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
2020-07-07 11:13:35 +02:00
CedricMocquillon
1aa4f6bf96 The number of skills points a trainer can teach is based either on its base
values or on its modified ones depending on the new setting 'trainers training
 skills based on base skill' value
2020-07-06 20:30:14 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills.
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
2020-07-06 20:28:08 +02:00
David Cernat
5eb7eb8d88 Add OpenMW commits up to 4 Jul 2020
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/charactercreation.cpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/character.cpp
2020-07-04 16:50:54 +03:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
Replace OpenThreads by std types
2020-07-04 13:11:23 +02:00
Andrei Kortunov
9ec61c14d2 Mark some methods as overrides to avoid warnings 2020-07-04 12:00:30 +04:00
Andrei Kortunov
d1b5f17390 Remove redundant virtual qualifier 2020-07-04 10:17:39 +04:00
Andrei Kortunov
27f1a3376c Add a separate stats watcher for GUI 2020-07-01 15:55:44 +04:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00
David Cernat
3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
2020-06-22 20:50:55 +03:00
fredzio
ae27ad6bcd Follow up to MR 126
Fill settings-default.cfg with default values as RGBA values are not intuitive for end users.
Add a boolean setting to enable the formatting (disabled by default).
2020-06-22 04:31:12 +02:00
psi29a
981184109e Merge branch 'formattopics' into 'master'
Change color of keywords in the dialogue window (#2159)

See merge request OpenMW/openmw!126
2020-06-21 07:58:02 +00:00
Bret Curtis
9446cece62 Issue #5468: Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly. 2020-06-18 13:23:39 +02:00
Bret Curtis
c944acf26b
Merge pull request #2913 from akortunov/warnfix
Get rid of ECLD and dependencies
2020-06-17 15:00:57 +02:00
Andrei Kortunov
d1a3cc98ff Get rid of ECLD and dependencies 2020-06-17 13:09:16 +04:00
Andrei Kortunov
3e396a904e Reset selected slot when close savegame dialogue to avoid accidental saving/loading 2020-06-17 11:09:17 +04:00
bzzt lost a hitlab login
0b4226f3e2 ico effieciency
Signed-off-by: Bret Curtis <psi29a@gmail.com>
2020-06-13 00:22:28 +02:00
David Cernat
e5b1843089 Add OpenMW commits up to 11 Jun 2020
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/activespells.cpp
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aiactivate.hpp
#	apps/openmw/mwmechanics/creaturestats.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2020-06-11 13:21:58 +03:00
David Cernat
36a2308acd Add OpenMW commits up to 30 May 2020
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwbase/windowmanager.hpp
#	apps/openmw/mwgui/windowmanagerimp.hpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwscript/interpretercontext.cpp
2020-06-09 17:50:26 +03:00
David Cernat
62df188fd4 Add OpenMW commits up to 16 May 2020
# Conflicts:
#	CI/before_script.linux.sh
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwscript/globalscripts.cpp
#	apps/openmw/mwscript/interpretercontext.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/cellstore.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
#	components/interpreter/context.hpp
2020-06-06 22:38:28 +03:00
Bret Curtis
204d2acf25
Merge pull request #2092 from akortunov/float_stats
Store attributes and skills values as floats
2020-06-05 22:38:12 +02:00
Andrei Kortunov
81805b7263 Introduce a separate class to control world date and time 2020-06-05 12:07:32 +04:00
Andrei Kortunov
5468fcb29f Store attributes and skills values as floats (bug #4021) 2020-06-03 17:34:15 +04:00
Andrei Kortunov
3dce225f28 Implement vanilla-style corprus handling (bug #3714, bug #4623) 2020-06-03 12:58:17 +04:00
Andrei Kortunov
396afe79f1 Move font loading to the FontLoader 2020-05-28 23:18:31 +04:00
Bret Curtis
f36288569c
Merge pull request #2874 from akortunov/windowmanager
Cleanup WindowManager
2020-05-28 13:22:23 +02:00
Andrei Kortunov
2ff04b4e73 Move TextColours initialization to the TextColours itself 2020-05-26 18:35:16 +04:00
Andrei Kortunov
dcfc4cc5dd Rename onFrame() to update() to make WindowManager consistent with other managers 2020-05-26 18:35:16 +04:00
Andrei Kortunov
000e44a18e Move data from WindowManager to CharacterCreation to simplify API 2020-05-26 18:35:13 +04:00
Capostrophic
51c0806a31 Use AppliedOnce flag in more effect duration calculations (#5425) 2020-05-24 18:37:21 +03:00
David Cernat
94b211dd4f [Client] Synchronize changes to gold pools from other services 2020-05-20 08:09:25 +03:00
David Cernat
3c51f1c23a [General] Include last gold restock time in ObjectMiscellaneous packets 2020-05-16 19:10:11 +03:00
David Cernat
23ff7b9610 [General] Synchronize gold pools for traders via ObjectMiscellaneous 2020-05-16 02:51:11 +03:00
Andrei Kortunov
e827d9c04f Disable physics profiler, if Bullet was compiled without profiling support 2020-05-15 12:48:41 +04:00
Bret Curtis
42cba092b7
Merge pull request #2716 from akortunov/png
Store fog of war as a PNG image instead of TGA
2020-05-12 11:52:23 +02:00
Bret Curtis
507adac8cd
Merge pull request #2783 from akortunov/input
Refactor InputManager
2020-05-12 09:34:22 +02:00
David Cernat
95e5e6d33d [Client] Prevent constant loss of key focus for chat window 2020-05-11 01:57:19 +03:00