Commit Graph

137 Commits (move)

Author SHA1 Message Date
scrawl a6e23d03d3 Don't clamp disposition twice, clamping is already done inside getDerivedDisposition 9 years ago
scrawl 12ec90f9e7 Change default argument, fix GetDisposition 9 years ago
ae-g-i-s c9791c5c1a Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233) 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
scrawl 77f1387da8 Include cleanup 10 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
10 years ago
Stanislav Bas c40987338d Scrollbars don't save their positions between openings 10 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 10 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
10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
scrawl 8c810e3620 Move rng to components 10 years ago
Marc Zinnschlag 86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 10 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.
10 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 10 years ago
dteviot e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305
fixes for mistakes in last commit.
10 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
10 years ago
Alexander "Ace" Olofsson df5a08b6de Move manualref code out of header 10 years ago
scrawl bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 10 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)
10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 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
scrawl cfc57d0fe0 Use MyGUI's castType for widget casts 10 years ago
scrawl 7fa3100993 Refactor TradeWindow balance buttons to use ControllerRepeatClick 10 years ago
scrawl 07d827c907 Ignore invalid input in numeric EditBox (Fixes #1885) 10 years ago
scrawl 0b1e997bdd Make sure dialogue is ended properly when closing it by using a service (Fixes #1755) 11 years ago
scrawl c6d3b0b70b Moved merchant restock from trade start to dialogue start, since other services also interact with it. 11 years ago
scrawl 6cd739678a Fix dangling model pointer after reference cleanup (Fixes #1653) 11 years ago
scrawl f2799ea1d9 Reset item model when reference is reset (Fixes #1628)
This caused crashes when the window was resized after the reference no longer exists (e.g. when a savegame is loaded)
11 years ago
scrawl 4aab4e1c26 Ignore item condition when determining value, except in trade (Fixes #1557) 11 years ago
scrawl 9627146bf4 Another fix for trade exploit (hopefully the last: Fixes #1408) 11 years ago
scrawl 0f1b39bca4 Fix trade exploit
Using the Max Sale button it was possible to "invert" the buying/selling state.
11 years ago
scrawl a1bdf20958 Make trade balance label editable 11 years ago
Digmaster e3e51324a4 Esc button exits all non-modal GUI windows 11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
scrawl b4ed828e21 Feature #1323: Implement restocking items (does not handle levelled lists yet) 11 years ago
Thoronador 1b8c975d5b minor performance improvements in apps/openmw
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
11 years ago
Jeffrey Haines 401d21b4ee getBaseGold implemented in MWWorld::Class for NPC and Creature
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
11 years ago
Jeffrey Haines 895748f18d Gold Pool implemented for Vendors
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
11 years ago
Jeffrey Haines 6896142db1 Trader Gold Reset Delay
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
11 years ago
Jeffrey Haines 2a8bf46607 Trader Gold Reset Delay
Implemented traded gold reset delay.

Note:
Traders gold pool is still in inventory.
11 years ago