a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
fa2bf0663e
[General] Simplify vectorContains
7 years ago
53346e2663
[Client] Return 0 if effect not found
7 years ago
c5c1a160b2
[Client] Comment out an unused variable
7 years ago
895634cd16
[General] Change type of MpNum to "unsigned int"
7 years ago
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
7 years ago
bef53749ed
[General] Replace BaseObject's hasMaster variable with isSummon
...
Additionally, add a GetObjectSummonState() script function to the server.
7 years ago
8ce225b1cc
[Client] Use the casters of damage-dealing spells as death reasons
7 years ago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
7 years ago
958b220835
[General] Send summon duration to server in ObjectSpawn packets
7 years ago
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
7 years ago
09c9bd34c3
cleanup more unnecessary struct keywords...
7 years ago
6e9c08083d
Add missing empty attacker checks
7 years ago
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
7 years ago
596be205c1
cleanup unnecessary struct keywords...
7 years ago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
7 years ago
7ae388086b
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
7 years ago
24d5fb09da
fix crash on simultaneous key presses
7 years ago
f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
...
Fix some GCC warnings
7 years ago
d790a27060
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
5455490ad2
Avoid fall-through in spell selection
7 years ago
80a3f0a0d4
switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers
7 years ago
335e2c5897
add keyData struct + general cleanup
7 years ago
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
b81ca18316
[Client] Don't clear container Ptrs when disposing of corpses
...
The reason for this is that only the server should be determine whether a corpse can be disposed of or not.
7 years ago
5fcb091127
Replace FIXME with a detailed explanation of the issue
7 years ago
9c78364c45
Revert "Merge pull request #1771 from Xenkhan/master"
...
This reverts commit 9667dd051cf52e06fc19
7 years ago
7ffdb18bf9
[General] Implement ActorDeath packet, part 1
...
ActorDeath packets are sent for dead actors before their StatsDynamic packets. They contain the actor's deathReason in a manner similar to that of PlayerDeath packets.
A future commit will replace the deathReason with a variable named killer which will be an mwmp::Target.
7 years ago
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
7 years ago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
7 years ago
7060ff59c5
[Client] Enforce the default global map cell size in multiplayer
7 years ago
fec500c4b0
[Client] Reduce container debug spam by requiring VERBOSE logging for it
7 years ago
914b79fcc9
[General] Make it possible to check which placed objects have containers
7 years ago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
7 years ago
186ec8c50f
rm ContainerStore/refItem
7 years ago
705b2dca0e
Merged pull request #1777
7 years ago
baeaff2309
Merged pull request #1778
7 years ago
97d8cc0efe
Check if the local was not found, just for sure
7 years ago
7dff8d8fe2
Check cell for null
7 years ago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
7 years ago
441463327c
Validate map size
7 years ago
359e748c28
Initialize some missing fields in constructors
7 years ago
deda6ec071
[Client] Don't send WorldMap packets for already explored map tiles
7 years ago
ecafcefae9
Fall back to regular head when getVampireHead fails
7 years ago
35b0546737
Consider <p> tag when discarding post-EOL tag text (regression #4473 )
7 years ago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
7 years ago
a55583a395
Merge branch 'master' into master
7 years ago
7e90d1f2a4
[Client] Fix interior-to-exterior and v.v. cell transitions for actors
...
Make sure only players who are cell authorities can get actors to teleport across cells for them, and display a message box for players who are not cell authorities.
7 years ago
405a0caf29
Remove unneeded whitespace
7 years ago
David Cernat
Koncord
Thunderforge
Finbar Crago
Marc Zinnschlag
Capostrophic
Bret Curtis
Andrei Kortunov
Nikolay Kasyanov
Xenkhan