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
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
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
09c9bd34c3
cleanup more unnecessary struct keywords...
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
ed71656ea6
fix updateActivatedQuickKey() crash
...
keyboard numbers don't start at zero...
7 years ago
24d5fb09da
fix crash on simultaneous key presses
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
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
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
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
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
7 years ago
441463327c
Validate map size
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
fd05beef94
[Client] Don't delete disposed of corpses on client
...
Clients should instead await a server reply approving the deletion.
7 years ago
d629c30fdb
Merge branch 'master' into screenshot360
7 years ago
61c968d550
Ignore broken items when search for replacement (bug #4453 )
7 years ago
1c8a20a54a
Set ok button focus in settings window by default ( fixes #4368 )
7 years ago
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
...
Do not show any book text after last <BR> tag
7 years ago
66a46ff03c
Do not show any book text after last <BR> tag.
7 years ago
d43766d3c9
Make WakeUpPC interrupt waiting if it was supposed to be ( fixes #3629 )
7 years ago
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
1a354f88ac
Make choices trigger goodbye if Goodbye is used ( fixes #3897 )
7 years ago
191cc76378
Consider faction ownerships in item stolen checks ( fixes #4293 )
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
1abff5365b
Capitalize enchanted items names again in spells window
7 years ago
afae398b5c
Use utf8 lowercase function for journal index to avoid code duplication
7 years ago
b5374029e5
Implement case-insensitive search in spell window
7 years ago
9ac752ea70
Implement filtering in the spells window
7 years ago
031a80ed5a
[Client] Don't advance time when waiting, traveling, training or jailed
7 years ago
1e749938fb
Merge pull request #426 from OpenMW/master
...
Add OpenMW commits up to 15 May 2018
7 years ago
c75d774356
Merge pull request #1692 from akortunov/playsound
...
Prevent PlaySound overlapping
7 years ago
9b9dd4abaf
Merge pull request #425 from OpenMW/master
...
Add OpenMW commits up to 13 May 2018
7 years ago
78234f9071
[General] Rename Event into ObjectList & WorldObject into BaseObject
7 years ago
6bf3a0be1e
[General] Rename WorldPackets into ObjectPackets for clarity
7 years ago
57b791ea2a
[Client] Show selected object's refNum & mpNum in console window title
...
This allows for much easier debugging of all objects and actors.
7 years ago
32d71de2f5
Update MapWindow every frame, not just when it's open (bug #4279 )
7 years ago
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
7 years ago
4872edc5ed
Prevent PlaySound overlapping
7 years ago
02eef933fd
Merge pull request #411 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2018
7 years ago
5d1b40c5ea
Merge pull request #1678
7 years ago
57070b7f5c
[Client] Disable automatic transition to other chargen menus from OpenMW
...
Previously, after finishing the TES3MP chargen once, mCreationStage was set to 4 in OpenMW, which in turn made it impossible to go through only specific chargen menus again as the result of the relevant TES3MP script function (tes3mp.SetCharGenStage(pid, startStage, endStage) in 0.6.3, player:setCharGenStages(startStage, endStage) in 0.7). In other words, trying to allow a player to just choose their class again made it so the player started at that menu and went through all the other subsequent menus as well, i.e. the player went through the class, birthsign and review menus.
7 years ago
8617d0603b
Display a message if a spell the player tries to use via a quick key is missing ( fixes #4391 )
7 years ago
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes
7 years ago
David Cernat
Thunderforge
Finbar Crago
Marc Zinnschlag
Andrei Kortunov
Capostrophic
Miloslav Číž
Capostrophic
Bret Curtis
scrawl
Capostrophic
tri4ng1e