David Cernat
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
2020-04-13 19:53:42 +03:00
Capostrophic
96a447ee3a
Show the soulgem soul in count dialog (feature #5362 )
2020-04-12 11:55:00 +03:00
David Cernat
cc25612b8d
Add OpenMW commits up to 18 Sep 2019
...
# Conflicts:
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwmechanics/security.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/miscextensions.cpp
2019-09-18 23:46:08 +03:00
Capostrophic
718dbd3f9a
Use object ID as the substitution for their name (bug #5158 )
2019-09-11 00:06:50 +03:00
Capostrophic
6b74630f6e
Preparation work
...
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
2019-09-10 23:38:16 +03:00
David Cernat
353e7d530a
Add OpenMW commits up to 18 Aug 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-22 22:44:00 +03:00
David Cernat
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
2019-08-21 19:04:04 +03:00
capostrophic
e5331aab28
Escape number signs in object names for tooltips
2019-08-17 21:53:52 +03:00
Andrei Kortunov
3032b177a1
Remove redundant includes
2019-02-23 08:02:12 +04:00
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
2018-07-14 03:57:05 +03:00
Andrei Kortunov
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
2018-07-11 00:06:21 +04:00
Koncord
fa2bf0663e
[General] Simplify vectorContains
2018-07-03 18:41:03 +08:00
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.
2018-06-28 04:53:00 +03:00
David Cernat
3efe05a88e
[General] Implement WorldCollisionOverride packet
2018-05-27 16:05:40 +03:00
declan-millar
b8df4b7c5a
Tidy in-code comment
2018-05-21 22:14:23 +01:00
declan-millar
844aef85f3
Replace spelling: soulgem -> soul gem in code comment
2018-05-21 22:12:19 +01:00
declan-millar
9ed4f33048
Replace spelling: soulgem -> soul gem
2018-05-21 19:10:24 +01:00
declan-millar
028b528c0b
Get soul magnitude before checking the rebalance setting
2018-05-21 18:16:04 +01:00
declan-millar
9346a552fa
Use Rebalance soulgem values option to set soulgem value
2018-05-21 13:59:20 +01:00
declan-millar
78e79d5775
Add advanced option to Rebalance soulgem values to the launcher
2018-05-21 13:33:42 +01:00
declan-millar
4b1247597e
Use soulgem value rebalance formula from morrowind code patch
2018-05-20 17:06:26 +01:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
2018-03-08 23:38:04 +00:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Allofich
502a26a7ff
Use getWeightString() to avoid casting to int
2016-08-14 19:38:53 +09:00
Allofich
4f5d676b4e
Allow weight tooltips for gold and keys if not 0
2016-08-14 19:32:43 +09:00
scrawl
e5d9ee30f4
Add count argument to copyObjectToCell
...
Fixes the gold bug introduced in c9ca5bc946
2015-12-19 16:48:32 +01:00
scrawl
32d5dece58
Add count argument to getToolTipInfo
2015-12-19 16:29:07 +01:00
scrawl
b0894ea20d
Accept a ConstPtr in hasToolTip
2015-12-19 16:15:45 +01:00
scrawl
04f7a8f8eb
Remove redundant getId function
2015-12-18 16:58:38 +01:00
scrawl
da7ebfde99
Accept a ConstPtr in copyToCell
2015-12-18 16:27:18 +01:00
scrawl
d77f785cbc
Accept a ConstPtr in get*SoundId
2015-12-18 16:09:54 +01:00
scrawl
e0bb284804
Accept a ConstPtr in getWeight
2015-12-18 16:00:50 +01:00
scrawl
0047a2d330
Accept a ConstPtr in canSell
2015-12-18 15:58:45 +01:00
scrawl
beb8805a12
Accept a ConstPtr in getInventoryIcon
2015-12-18 15:53:47 +01:00
scrawl
f258c5c508
Accept a ConstPtr in getModel
2015-12-18 15:51:05 +01:00
scrawl
d9bbd83b09
Accept a ConstPtr in getToolTipInfo
...
Accept a ConstPtr in functions used by getToolTipInfo
2015-12-18 15:47:16 +01:00
scrawl
b48445dea7
Accept a ConstPtr in getScript
2015-12-18 00:12:03 +01:00
scrawl
fc449233be
Restore support for inserting objects into a cell
2015-12-04 18:29:41 +01:00
scrawl
0975f60d59
Stub out CellStore::get<T> accessors in preparation of reference movement between cells
2015-12-04 18:29:41 +01:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
Koncord
75e5023590
fix code duplication
2015-07-20 08:06:43 +09:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
2015-03-06 23:19:57 +13:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
scrawl
41b3a9dba9
Rewrite animated collision shape support ( Fixes #2123 )
2015-01-13 05:37:37 +01:00
scrawl
6ddd9cc5a2
Don't show weight or value for keys ( Fixes #1815 )
2014-08-16 16:51:56 +02:00
Marc Zinnschlag
c9cd7fb6b7
Merge branch 'scripts'
2014-07-28 09:02:24 +02:00
scrawl
75366b2e37
Implement CellRef's faction rank (rank requirement to use item)
2014-07-24 02:17:38 +02:00
