77a1d947cc
extracted MWMechanics::getPlayer()
10 years ago
77f1387da8
Include cleanup
10 years ago
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
c40987338d
Scrollbars don't save their positions between openings
10 years ago
e23775e338
Fix -Woverloaded-virtual clang warnings
10 years ago
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
997347b01e
Silence -Wreorder warnings.
10 years ago
8c810e3620
Move rng to components
10 years ago
86d39cede9
Merge remote-tracking branch 'dteviot/Rng'
10 years ago
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
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
e6cd8484a2
fixing MSVC 2013 warning C4244: & C4305
...
fixes for mistakes in last commit.
10 years ago
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
df5a08b6de
Move manualref code out of header
10 years ago
bea88c3643
Stolen item tracking overhaul part 2 ( Fixes #2338 )
10 years ago
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
eecea4131f
Reduce MyGUI includes
10 years ago
fb542a64ec
Merchant items should be restocked instantly
10 years ago
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
d5768af952
Fix INT_MIN trade exploit ( Fixes #2096 )
10 years ago
9cce3bc31b
Implement fDispositionMod according to research wiki
10 years ago
58571f7ac2
Revert "Transfer item ownership to the buyer if item wasn't stolen"
...
Fixes #1953 .
This reverts commit 5d77c5e8ca
10 years ago
0bc840aadd
Add NumericEditBox widget
10 years ago
40587f984d
Implement price-based mercantile skill progress ( Fixes #1947 ), thanks Hrnchamd
...
Correct barter formula (removed erroneous clamping)
10 years ago
0f99a959eb
Update barter offer for all items when another item is added ( Fixes #1935 )
10 years ago
5d77c5e8ca
Transfer item ownership to the buyer if item wasn't stolen ( Fixes #1933 )
10 years ago
f82224497a
Compatibility fix for MyGUI git
10 years ago
cfc57d0fe0
Use MyGUI's castType for widget casts
10 years ago
7fa3100993
Refactor TradeWindow balance buttons to use ControllerRepeatClick
10 years ago
07d827c907
Ignore invalid input in numeric EditBox ( Fixes #1885 )
10 years ago
0b1e997bdd
Make sure dialogue is ended properly when closing it by using a service ( Fixes #1755 )
11 years ago
c6d3b0b70b
Moved merchant restock from trade start to dialogue start, since other services also interact with it.
11 years ago
6cd739678a
Fix dangling model pointer after reference cleanup ( Fixes #1653 )
11 years ago
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
4aab4e1c26
Ignore item condition when determining value, except in trade ( Fixes #1557 )
11 years ago
9627146bf4
Another fix for trade exploit (hopefully the last: Fixes #1408 )
11 years ago
0f1b39bca4
Fix trade exploit
...
Using the Max Sale button it was possible to "invert" the buying/selling state.
11 years ago
a1bdf20958
Make trade balance label editable
11 years ago
e3e51324a4
Esc button exits all non-modal GUI windows
11 years ago
039398c8ae
Basic RefData and CellRef change tracking
...
Wrapped item charge handling in getItemHealth function
11 years ago
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
b4ed828e21
Feature #1323 : Implement restocking items (does not handle levelled lists yet)
11 years ago
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
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
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
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
11 years ago
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
11 years ago
f27701cbe8
Detect selling stolen items or enchanting with stolen items
11 years ago
589fbbd871
Issue #777 : Create InventoryStore for creatures with weapons/shields
11 years ago
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
11 years ago
224f288359
Don't attempt to change disposition for creatures
11 years ago
0f5dc59176
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
11 years ago
098f9712f1
Add getPlayerPtr() utility method. Reduces dependencies a lot.
11 years ago
c85c2cff4e
Fix disposition changes from trades not applying properly
11 years ago
617a65cdd2
Print message to dialogue window after successful trade
11 years ago
b42240be6d
Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences.
11 years ago
6aa9e18915
Reset filter when starting a trade
11 years ago
b6c22ad5d9
Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount.
11 years ago
bab657fe2b
Add a utility function to add items to a ContainerStore by RefID
11 years ago
7eb1dcb682
Fix trade windows crashing after a new game
11 years ago
aefa54d72d
Pass item count to ManualRef constructor
...
This remove the need to call setCount in multiple places.
11 years ago
10abb9d297
Call ContainerStore::remove() to remove items from inventory
...
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).
Enchanting an item now unequips it.
11 years ago
46bc7bd9c8
Some cleanup since NpcStats is now also CreatureStats
...
This isn't a thorough cleaning, so keep an eye out for more
12 years ago
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
12 years ago
7dc30a01cd
Some changes suggested by cppcheck
12 years ago
3a6e54c4f5
Sell owned items in the cell
12 years ago
b56d50287e
Barter mechanic fix
12 years ago
0c4a963132
Container UI rewrite
12 years ago
60fadaeaf0
Cleaned up includes in implementation files
12 years ago
3f846a50d9
Merge remote-tracking branch 'galdor557/master'
...
Conflicts:
apps/openmw/mwgui/travelwindow.cpp
12 years ago
f7383905b7
Finally eliminated calls to MWBase::WindowManager in constructors
12 years ago
ce9bc6d9ba
MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions
12 years ago
480467b6eb
Reset the 'owner' field for items that were legitimately bought from an NPC.
12 years ago
f3c8cd2065
Don't buy/sell keys which are set to open a lock
12 years ago
1a2daa3bc1
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
12 years ago
e27e53f607
Fix not playable body parts appearing in the race selection menu.
12 years ago
0f0cc0e3e3
Fix a few gold conditions that I missed, trade window was affected
12 years ago
e7af718b55
Remove unnecessary WindowManager::messageBox arguments
12 years ago
918cdcffc2
Split up components/esm/loadlocks
12 years ago
d7c4a622cf
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
12 years ago
0ee0dbdb97
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
12 years ago
8e07638699
Update the trading offer on "max sale" button click
12 years ago
a3adcf752d
TradeWindow: fixed coding style
...
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
12 years ago
725bfe6372
TradeWindow: balance now changes per time if user holds +/- button
...
pressed
12 years ago
04cca2a1ce
fix for http://bugs.openmw.org/issues/517
12 years ago
386eec51c1
some skill usage fixes
12 years ago
ea8ee11ff7
tradding skill use
12 years ago
5332546541
tradding skill use
12 years ago
94aeb15220
bartering disposition change
12 years ago
d53a7ade1e
method names, disposition uint->int
12 years ago
b2afb1fd5c
Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/spellbuyingwindow.cpp
apps/openmw/mwgui/trainingwindow.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
bf4e855260
fixed creatures
12 years ago
4634227f1c
notify the user when the merchant doesn't accept the offer
12 years ago
0a883f4492
The player can now barter with merchants
12 years ago
a9c1ce412a
applying new interface vol.7, inconsistent
12 years ago
aaf1b66c7e
BarterOffer is used in other trading services too
12 years ago
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
12 years ago
2fa4ac177a
initial resolving
12 years ago
9f2668b45b
Task #400 Review GMST access
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
dteviot
scrawl
Stanislav Bas
Rohit Nirmal
Marc Zinnschlag
dteviot
Alexander "Ace" Olofsson
Digmaster
Emanuel Guevel
Thoronador
Jeffrey Haines
Chris Robinson
Britt Mathis
Sergey Shambir
lazydev
eduard
gugus
greye