teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
22,006 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 'a083439139'
${ noResults }
Commit Graph

157 Commits (a083439139b883b260605fac90d6304ea293effa)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts 
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
 6 years ago
Capostrophic ab29f9e13f Add permanent barter disposition change option (feature #3103) 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 cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 6 years ago
David Cernat 0ad9c99cf4 [Client] Send PlayerInventory packet after completing a vendor trade 7 years ago
scrawl 8964fc93d6 Fix dialogue window not being exited properly 7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways. 
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
 7 years ago
scrawl b7752ec52d Make TradeWindow not depend on DialogueWindow 7 years ago
scrawl 67dc4e019a Make Enter on trade window price attempt the trade 7 years ago
scrawl 2b03bc0c56 Call WindowBase::onFrame() for every active window 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
Andrei Kortunov f84eb68b3d Confiscate an item when you try to sell it to its owner (bug #3944) 7 years ago
Andrei Kortunov 35beede065 Restock items after trade deal instead of trade window opening 7 years ago
Andrei Kortunov 487e72fd23 Play Up sounds instead of Down ones in trade window (bug #3982) 7 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 7 years ago
Bret Curtis 154d7cffa2 replace and purge boost::function 7 years ago
Ben Shealy 5085afa3d7 Moved mechanics code from MWGui::TradeWindow to MWMechanics::Trading 8 years ago
Ben Shealy 8703609649 Allow +/- buttons in trade window to decrease offer to 0 8 years ago
scrawl a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 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
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 9 years ago
scrawl 77f1387da8 Include cleanup 9 years ago
scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 9 years ago
Stanislav Bas c40987338d Scrollbars don't save their positions between openings 9 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 9 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 9 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 9 years ago
scrawl 8c810e3620 Move rng to components 9 years ago
Marc Zinnschlag 86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 9 years ago
dteviot 3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 9 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 9 years ago
dteviot e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305 
fixes for mistakes in last commit.
 9 years ago
dteviot e197f5318b 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
 9 years ago
Alexander "Ace" Olofsson df5a08b6de Move manualref code out of header 9 years ago
scrawl bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 9 years ago
scrawl 4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531) 
Fix transparent window background not applying to the header bar (Fixes #2294)
 9 years ago
scrawl eecea4131f Reduce MyGUI includes 9 years ago
scrawl fb542a64ec Merchant items should be restocked instantly 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 d5768af952 Fix INT_MIN trade exploit (Fixes #2096) 10 years ago
scrawl 9cce3bc31b Implement fDispositionMod according to research wiki 10 years ago
scrawl 58571f7ac2 Revert "Transfer item ownership to the buyer if item wasn't stolen" 
Fixes #1953.

This reverts commit 5d77c5e8ca.
 10 years ago
scrawl 0bc840aadd Add NumericEditBox widget 10 years ago
scrawl 40587f984d Implement price-based mercantile skill progress (Fixes #1947), thanks Hrnchamd 
Correct barter formula (removed erroneous clamping)
 10 years ago
scrawl 0f99a959eb Update barter offer for all items when another item is added (Fixes #1935) 10 years ago
scrawl 5d77c5e8ca Transfer item ownership to the buyer if item wasn't stolen (Fixes #1933) 10 years ago
scrawl f82224497a Compatibility fix for MyGUI git 10 years ago