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
|
7 years ago |
Andrei Kortunov
|
c77c50e92b
|
Make Equip console command to bypass most of restrictions (bug #4460)
|
7 years ago |
Koncord
|
fa2bf0663e
|
[General] Simplify vectorContains
|
7 years ago |
|
David Cernat
|
9102df7fde
|
[General] Make WorldCollisionOverride also work with specific refIds
For now, this only makes it possible to enforce collision for specific refIds for placed objects.
|
7 years ago |
|
David Cernat
|
3efe05a88e
|
[General] Implement WorldCollisionOverride packet
|
7 years ago |
declan-millar
|
b8df4b7c5a
|
Tidy in-code comment
|
7 years ago |
|
declan-millar
|
844aef85f3
|
Replace spelling: soulgem -> soul gem in code comment
|
7 years ago |
|
declan-millar
|
9ed4f33048
|
Replace spelling: soulgem -> soul gem
|
7 years ago |
|
declan-millar
|
028b528c0b
|
Get soul magnitude before checking the rebalance setting
|
7 years ago |
|
declan-millar
|
9346a552fa
|
Use Rebalance soulgem values option to set soulgem value
|
7 years ago |
|
declan-millar
|
78e79d5775
|
Add advanced option to Rebalance soulgem values to the launcher
|
7 years ago |
|
declan-millar
|
4b1247597e
|
Use soulgem value rebalance formula from morrowind code patch
|
7 years ago |
scrawl
|
870c658500
|
Remove missing souls, remove some runaway exceptions (Fixes #4111)
|
7 years ago |
Bret Curtis
|
d48b829b45
|
replace and purge boost::lexical_cast
|
8 years ago |
|
Bret Curtis
|
d785344fad
|
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
|
8 years ago |
Allofich
|
502a26a7ff
|
Use getWeightString() to avoid casting to int
|
9 years ago |
|
Allofich
|
4f5d676b4e
|
Allow weight tooltips for gold and keys if not 0
|
9 years ago |
scrawl
|
e5d9ee30f4
|
Add count argument to copyObjectToCell
Fixes the gold bug introduced in c9ca5bc946
|
9 years ago |
|
scrawl
|
32d5dece58
|
Add count argument to getToolTipInfo
|
9 years ago |
|
scrawl
|
b0894ea20d
|
Accept a ConstPtr in hasToolTip
|
9 years ago |
|
scrawl
|
04f7a8f8eb
|
Remove redundant getId function
|
9 years ago |
|
scrawl
|
da7ebfde99
|
Accept a ConstPtr in copyToCell
|
9 years ago |
|
scrawl
|
d77f785cbc
|
Accept a ConstPtr in get*SoundId
|
9 years ago |
|
scrawl
|
e0bb284804
|
Accept a ConstPtr in getWeight
|
9 years ago |
|
scrawl
|
0047a2d330
|
Accept a ConstPtr in canSell
|
9 years ago |
|
scrawl
|
beb8805a12
|
Accept a ConstPtr in getInventoryIcon
|
9 years ago |
|
scrawl
|
f258c5c508
|
Accept a ConstPtr in getModel
|
9 years ago |
|
scrawl
|
d9bbd83b09
|
Accept a ConstPtr in getToolTipInfo
Accept a ConstPtr in functions used by getToolTipInfo
|
9 years ago |
|
scrawl
|
b48445dea7
|
Accept a ConstPtr in getScript
|
9 years ago |
|
scrawl
|
fc449233be
|
Restore support for inserting objects into a cell
|
9 years ago |
|
scrawl
|
0975f60d59
|
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
|
9 years ago |
|
scrawl
|
67bd6cd708
|
Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
|
10 years ago |
Koncord
|
75e5023590
|
fix code duplication
|
10 years ago |
|
scrawl
|
47758c11cd
|
Readded collision objects and movement physics
|
10 years ago |
|
scrawl
|
c31b416ba1
|
Move physicssystem to a new mwphysics module
|
10 years ago |
dteviot
|
45b6538820
|
fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
|
10 years ago |
Alexander "Ace" Olofsson
|
df5a08b6de
|
Move manualref code out of header
|
10 years ago |
|
scrawl
|
41b3a9dba9
|
Rewrite animated collision shape support (Fixes #2123)
|
10 years ago |
|
scrawl
|
6ddd9cc5a2
|
Don't show weight or value for keys (Fixes #1815)
|
11 years ago |
Marc Zinnschlag
|
c9cd7fb6b7
|
Merge branch 'scripts'
|
11 years ago |
|
scrawl
|
75366b2e37
|
Implement CellRef's faction rank (rank requirement to use item)
|
11 years ago |
|
scrawl
|
2b57c7fa67
|
Use CellRef's global variable to disable owner (Fixes #1677)
|
11 years ago |
|
Marc Zinnschlag
|
4fb897f2f8
|
added missing getId functions to classes derived from MWWorld::Class
|
11 years ago |
|
scrawl
|
039398c8ae
|
Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
|
11 years ago |
|
Marc Zinnschlag
|
83ded18af0
|
encapsulated reference collections
|
11 years ago |
|
scrawl
|
2b15b8b484
|
Fix gold bugs (Fixes #1145, Fixes #1146)
|
11 years ago |
|
scrawl
|
baf55df7a1
|
Gold fixes (when did this break?)
|
11 years ago |
|
scrawl
|
0285d18fc2
|
Respect items belonging to a faction
|
11 years ago |
|
scrawl
|
e6c0e187bc
|
Closes #1073: Check for all gold types in canSell. For containers, only gold_001 is relevant, but items in the world can be sold as well.
|
11 years ago |
|
scrawl
|
5729672262
|
Show marked position on map. Implement Detect X magic effects.
|
11 years ago |