b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
889bcec7f8
Add OpenMW commits up to 1 Sep 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
e679190f31
Introduce a custom format() function to get rid of boost::format() and hackish replace()
6 years ago
f775f7977b
Fix RaiseRank/LowerRank script functions (feature #4316 )
6 years ago
bb0c989f87
Clear expelled status when leaving faction
6 years ago
555e43855d
Allow scripted faction leaving using PCLowerRank (feature #5036 )
6 years ago
8ecd0b82a4
Replace Boost format and replace_all where possible
6 years ago
3032b177a1
Remove redundant includes
6 years ago
7ad93c1d3e
Gmst typo in MWMechanics::NpcStats::increaseSkill
6 years ago
90d35aaa8f
Handle current health level during levelup (bug #4649 )
6 years ago
7ef6fa9f61
Remove deprecated GMST get* functions
6 years ago
4b30a44816
[Client] Compare crimeTime and deathTime when NPCs forgive player crimes
...
Previously, all crime witnesses stopped being hostile to a respawning player for as long as the player's diedSinceArrestAttempt was true. That meant that, in an area with no guards to arrest the player, crime witnesses did not enage in combat with the player at all ever again until diedSinceArrestAttempt became false.
This commit makes it so the time of the last crime is recorded for each witness, and that is then compared with the time of the LocalPlayer's last death for a one-time crime forgiveness during that player's current life.
This is essentially a gameplay adjustment for "singleplayer with respawns," and will have to be reworked to make sense for every player in multiplayer, though that requires reworking the crime system as a whole and is thus on hold.
7 years ago
fa652964fd
Merge pull request #403 from OpenMW/master
...
Add OpenMW commits up to 9 Apr 2018
7 years ago
4f64ba7b7f
Implement sBookSkillMessage GMST
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
dc0313a36f
Use base skill value when calculating rank requirements
7 years ago
e3929df38a
Merge pull request #239 from OpenMW/master
...
Add OpenMW commits up to 14 Jul 2017
8 years ago
54b4d93f79
Added a special function for GUI sounds playing
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
8 years ago
edb155869b
Merge pull request #201 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2017
8 years ago
c3fd327bb2
Fixed drowning widget initialization
8 years ago
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
53e94b7c3f
Fix shadowing warnings
8 years ago
15a4602482
Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats
8 years ago
8fbc6f31f1
Add setLevelProgress function to OpenMW's NpcStats
8 years ago
dfc62c99b4
Show correct class image in level-up dialog ( Fixes #3443 )
9 years ago
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
2ce269c0fc
Werewolf stats compatibility with old save files
10 years ago
44582fe3b3
Don't use separate werewolf skills/attributes for non-player werewolves
...
Still need to deal with save files.
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
ca8c8c6aa4
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
e81d2a9dde
Merge remote-tracking branch 'upstream/openmw-35' into HEAD
...
Conflicts:
apps/openmw/mwmechanics/npcstats.cpp
10 years ago
9dbd9af31c
Adjust fix for Bug #2360 to repair affected savegames
10 years ago
b542143e3a
Fix faction reputation case sensitivity issue ( Fixes #2360 )
10 years ago
61ec9196c8
Cap the displayed attribute multiplier in levelup to attribute points left to 100
10 years ago
b5e0e45c78
Fix iLevelUpTotal not being used in the levelUp logic
10 years ago
ae77eacd7e
Skill progress refactoring
10 years ago
6d097fbfbd
Normalise spelling of "levelled" throughout the code
10 years ago
2346c3528d
Remove NpcStats::mProfit and store it in the script instead
...
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
10 years ago
431f540791
ESSImport: fix NPC factions
10 years ago
1869d37cfc
Remove unused mLastDrowningHit
10 years ago
579f5d232f
Move interactive messageBox to separate function
10 years ago
efa9ff3a76
Fix incorrect implementation of iWerewolfBounty
10 years ago
c4fa671381
Don't allow raising faction rank if the next rank has no name ( Fixes #1975 )
10 years ago
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
10 years ago
David Cernat
Andrei Kortunov
Alexei Dobrohotov
Capostrophic
Frederic Chardon
Capostrophic
Bret Curtis
Allofich
MiroslavR
scrawl
Rohit Nirmal
dteviot