teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
21,770 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6cb5ac6e63'
${ noResults }
Commit Graph

105 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
 6 years ago
Andrei Kortunov 3d1daaebab Rework manual spellcasting (e.g. via scripts) 6 years ago
David Cernat 2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 6 years ago
Capostrophic 191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 6 years ago
David Cernat 22521578eb
Merge pull request #349 from OpenMW/master 
Add OpenMW commits up to 28 Nov 2017
 7 years ago
scrawl 5fe68ab062
Merge pull request #1419 7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
 7 years ago
Andrei Kortunov 9943bd4d74 AiWander fast forwarding improvements (bug #3638) 7 years ago
Andrei Kortunov 99517d83ea Bound items detection refactoring 7 years ago
Andrei Kortunov a02124f884 Handle item owners during pickpocketing 7 years ago
David Cernat 38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 7 years ago
Andrei Kortunov 34895157f9 Consider taking items from unconscious NPC as a theft 7 years ago
David Cernat 7f0ea7d01f Merge pull request #294 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/character.cpp
 7 years ago
Andrei Kortunov 65d8e2ff5d Allow to use GetDetected without a reference (bug #3110) 7 years ago
David Cernat b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
 7 years ago
Andrei Kortunov a5b01fefec Allow to interrupt an attack, if attack button is held 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 7 years ago
scrawl dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes 
Do not allow player to change weapon/spell during attack or spellcast
 7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
Andrei Kortunov 7c80ddc9de Owned crosshair improvements (bug #2789) 7 years ago
Andrei Kortunov bc7353f100 Check animation state for GetPCRunning and GetPCSneaking 7 years ago
Andrei Kortunov f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 7 years ago
David Cernat 70d9374a6a [General] Implement PlayerKillCount packets 7 years ago
NeveHanter 8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 8 years ago
MiroslavR b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 8 years ago
scrawl 4acfe1a7e4 Move cleanupSummonedCreature to the mechanics manager (Bug #3439) 8 years ago
scrawl f417d7780a Fix the enemy nearby check (Bug #3423) 8 years ago
scrawl 79eb2d20e0 Cleanup 8 years ago
scrawl 12ec90f9e7 Change default argument, fix GetDisposition 8 years ago
ae-g-i-s c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 8 years ago
ae-g-i-s 2f1c6c740c Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)" 
This reverts commit 000597236e.
 8 years ago
ae-g-i-s 000597236e Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233) 8 years ago
scrawl f052c05018 Move werewolf functions from World to MechanicsManager 9 years ago
scrawl 53f4b92426 AiEscort do not follow target through doors 
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
 9 years ago
scrawl 965bea45c0 AiEscort makes the actor side with target in fights (Bug #2697) 
Also will follow the player through teleport doors.
 9 years ago
Arthur Moore 5e6fcc2aef Alert the user if attempting to play an animation fails 
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
 9 years ago
scrawl 278a078e9d Unify magic effect tick functions 
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
 9 years ago
Jiří Kuneš 4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 9 years ago
Jiří Kuneš c019f8e23d use correct mechanics manager 9 years ago
scrawl de8e5f0db1 Restore projectiles 9 years ago
scrawl bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 9 years ago
scrawl aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 9 years ago
scrawl c883a73d30 Several warning fixes 9 years ago
scrawl 9e5dfb6e98 Update crime system according to research wiki for more accurate attack responses 10 years ago
scrawl f3738e9a98 Say an "intruder" voice dialogue for trespassing crimes (Fixes #1082) 
Seems to be broken in the original engine, but according to the TES-CS help this is how the intruder voices should be used. There are legitimate entries for "intruder" in the game's files, so we might as well use them.
 10 years ago
scrawl 866fdfe8bd Crime system improvements 
- If someone saw the crime, they will notify everyone else in range, even if the Alarm rating of the witness is 0.
- Pickpocket and selling stolen items now works properly, i.e. honors the victim's Alarm rating instead of always being reported.
 10 years ago
scrawl d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785) 
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
 10 years ago
scrawl 109a3f78a1 Adjust AiFollow distance for groups of multiple followers (Fixes #1637) 10 years ago
scrawl 45f14f0704 Fix stolen faction-owned items not being confiscated 10 years ago
scrawl e868a48a63 Don't trigger OnPcHitMe for friendly hits (Fixes #1950) 
Don't consider actors as followers if they are also in combat with the follow target
 10 years ago