da6223fc4b
Use default icon.tga when inventory icon is missing
4 years ago
e1259fdc41
Add OpenMW commits up to 4 Feb 2021
...
# Conflicts:
# apps/openmw/engine.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwrender/globalmap.cpp
4 years ago
14cf0ce1dc
Implement instanced groundcover
4 years ago
663e0a1055
Fix a race condition in loading screen.
4 years ago
3bb551a6f1
Show level multipliers in levelup tooltip
4 years ago
a80ee7a76a
Avoid possible memory leak in the mInterMessageBoxe field
4 years ago
8e5f26c109
Code cleanup
4 years ago
7fc4c9f3f6
Avoid dead code
4 years ago
da3316daf8
Add OpenMW commits up to 4 Jan 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwphysics/mtphysics.hpp
# components/CMakeLists.txt
4 years ago
66fee6dccb
Enhance level-up tooltip
4 years ago
7d8727b98e
Merge branch 'books' into 'master'
...
Only ignore plain text after the last EOL tag (#5627 )
Closes #5627
See merge request OpenMW/openmw!492
4 years ago
1f1755ae48
Add version checks
4 years ago
bdcbb412a5
Don't restore focus to hidden/unrelated buttons
4 years ago
fd77ef6b01
Only ignore plain text after the last EOL tag ( #5627 )
4 years ago
3e87c35005
Merge branch 'dialogue' into 'master'
...
Don't regenerate the topics list unconditionally
See merge request OpenMW/openmw!459
4 years ago
eec2ba3623
Loading screen initialdrawcallback 4th time's the charm
4 years ago
ea8f98b339
Wait for initialDrawCallback to finish before removing it
4 years ago
96a87b582c
Merge branch 'loadingScreen_initialdrawcallback' into 'master'
...
Fix for !472 for older versions of OSG
See merge request OpenMW/openmw!474
(cherry picked from commit 35e25d79b9a6c76807084be5ca2584c4fd9b9c35)
4447dd41 osg versions
06f4d63b Preserve callback in older osg version
4 years ago
db32f7f9f8
[Client] Use ObjectDialogueChoice for highlighted topics in dialogue
...
The packet is now sent not just for items in the list on the right of the dialogue screen, but also for the clickable topics in the dialogue text itself.
4 years ago
bc961a13f5
avoid redundant calls to removeInitialDrawCallback
4 years ago
640420eaaa
No longer delete and recreate CopyFramebufferToTextureCallback, remove oneshot functionality. Instead just remove the callback after the traversals. Use addInitialDrawCallback instead of setInitialDrawCallback to avoid messing with existing callbacks.
4 years ago
1a4b817b31
[General] Rework ObjectDialogueChoice for multilingual compatibility
...
Use a different system for sending and applying ObjectDialogueChoice packets.
4 years ago
817ac4cfbd
Don't regenerate the topics list unconditionally
4 years ago
6bfdf0e57f
Add more information on mouse over level
4 years ago
078de86e60
Use range based for loops and auto
4 years ago
4620adc662
Add OpenMW commits up to 30 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwphysics/actor.cpp
4 years ago
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
bc6f46465f
Add to changelog, authors. Move variable declaration inside block
4 years ago
2413de38b5
Extend spell/item search to search by magic effect name
4 years ago
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
4 years ago
9763995892
Fix regression #5666
4 years ago
9dcb0f4c32
[General] Implement ObjectDialogueChoice packet
4 years ago
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
4 years ago
f1b7cd5404
Don't reset temporarily hidden container window
4 years ago
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal
...
Add support for service-specific refusals
4 years ago
82431b752d
removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd
4 years ago
6c591c190b
Add support for service-specific refusals (feature #5580 )
4 years ago
065ed5138e
Use emplace_back instead of push_back
4 years ago
8050882baf
Merge pull request #3015 from akortunov/overrides
...
Mark overrided methods as overrides
4 years ago
df178ed97c
Merge branch 'container-regressions' into 'master'
...
Fix container regressions
See merge request OpenMW/openmw!346
(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)
95e7a22d fix container regressions
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
4 years ago
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
4 years ago
39678c74bf
Add many more godmode checks to harmful magic (bug #5633 )
4 years ago
14aacb81c5
Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation.
4 years ago
845049a166
Prevent empty right page of journal having invisible topics ( Fixes #5588 )
4 years ago
0eedf8fd9f
Add OpenMW commits up to 30 Sep 2020
...
# Conflicts:
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/summoning.cpp
# components/CMakeLists.txt
4 years ago
f2af957647
Reset enchant effects displayed range when they are constant (bug #5603 )
4 years ago
753ca91556
Set a minimum 1gp cost for services (regression #5600 )
4 years ago
67eace1028
Use struct instead of tuple
4 years ago
924f634bda
Support for multiple summons with same ID in the single spell
4 years ago
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
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
4 years ago
2cb16e778c
[General] Use clearer method name for tracking InterpreterContext type
5 years ago
ff10aa816b
Add OpenMW commits up to 25 Jul 2020
...
# Conflicts:
# .travis.yml
5 years ago
58d8367cb0
[Client] Handle input from server-sent custom messageboxes less hackily
5 years ago
eb1641dd86
[Client] Fix crashes caused by current modals with invalid widgets
5 years ago
a5da59e840
Merge pull request #2967 from Capostrophic/casesensitivity
...
Fix search filter unicode character case sensitivity
5 years ago
65ac0c86b8
Fix search filter unicode character case sensitivity
5 years ago
7f936e4cde
Merge pull request #2961 from akortunov/move
...
Do not use outdated references when moving objects to new cells
5 years ago
39e429c9eb
Add OpenMW commits up to 11 Jul 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
5 years ago
da791590ac
Update HUD icons during mechanics update again to avoid crashes
5 years ago
db8f0ad6fd
Do not use outdated references when moving objects to new cells (bug #5387 )
5 years ago
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
5 years ago
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
5 years ago
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'
5 years ago
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
5 years ago
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
...
Replace OpenThreads by std types
5 years ago
9ec61c14d2
Mark some methods as overrides to avoid warnings
5 years ago
d1b5f17390
Remove redundant virtual qualifier
5 years ago
27f1a3376c
Add a separate stats watcher for GUI
5 years ago
d0fe15b095
Use meaningful names instead of mSkill1 and mSkill2
5 years ago
40ad87bc4d
Replace OpenThreads by std types
5 years ago
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
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).
5 years ago
981184109e
Merge branch 'formattopics' into 'master'
...
Change color of keywords in the dialogue window (#2159 )
See merge request OpenMW/openmw!126
5 years ago
9446cece62
Issue #5468 : Apparently this was always a problem but OP made "nested loading" more visible. This should resolve nested loading correctly.
5 years ago
c944acf26b
Merge pull request #2913 from akortunov/warnfix
...
Get rid of ECLD and dependencies
5 years ago
d1a3cc98ff
Get rid of ECLD and dependencies
5 years ago
3e396a904e
Reset selected slot when close savegame dialogue to avoid accidental saving/loading
5 years ago
0b4226f3e2
ico effieciency
...
Signed-off-by: Bret Curtis <psi29a@gmail.com>
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
204d2acf25
Merge pull request #2092 from akortunov/float_stats
...
Store attributes and skills values as floats
5 years ago
81805b7263
Introduce a separate class to control world date and time
5 years ago
5468fcb29f
Store attributes and skills values as floats (bug #4021 )
5 years ago
3dce225f28
Implement vanilla-style corprus handling (bug #3714 , bug #4623 )
5 years ago
396afe79f1
Move font loading to the FontLoader
5 years ago
f36288569c
Merge pull request #2874 from akortunov/windowmanager
...
Cleanup WindowManager
5 years ago
2ff04b4e73
Move TextColours initialization to the TextColours itself
5 years ago
dcfc4cc5dd
Rename onFrame() to update() to make WindowManager consistent with other managers
5 years ago
000e44a18e
Move data from WindowManager to CharacterCreation to simplify API
5 years ago
51c0806a31
Use AppliedOnce flag in more effect duration calculations ( #5425 )
5 years ago
94b211dd4f
[Client] Synchronize changes to gold pools from other services
5 years ago
3c51f1c23a
[General] Include last gold restock time in ObjectMiscellaneous packets
5 years ago
23ff7b9610
[General] Synchronize gold pools for traders via ObjectMiscellaneous
5 years ago
e827d9c04f
Disable physics profiler, if Bullet was compiled without profiling support
5 years ago
42cba092b7
Merge pull request #2716 from akortunov/png
...
Store fog of war as a PNG image instead of TGA
5 years ago
AnyOldName3
David Cernat
Andrei Kortunov
madsbuvi
Cédric Mocquillon
Evil Eye
Alexei Dobrohotov
psi29a
Mads Buvik Sandvei
CedricMocquillon
jefetienne
AnyOldName3
Charles Calhoun
Kyle Shrader
Frederic Chardon
elsid
bzzt lost a hitlab login