teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
21,770 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6cb5ac6e63'
${ noResults }
Commit Graph

2717 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
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
 6 years ago
David Cernat 09da24f1ea [General] Rename all instances of refNumIndex into refNum 
This creates symmetry with mpNum and should cause less confusion in the future.
 6 years ago
Marc Zinnschlag ee759effce Merged pull request #1798 6 years ago
Andrei Kortunov c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
David Cernat 4d4bced929 [Client] Allow singleplayer-only saves in main menu during multiplayer 6 years ago
terrabyte25 48296a7452
Update trainingwindow.cpp 6 years ago
David Cernat 6ff7fa525e [Client] Disable autosaving when waiting 6 years ago
Capostrophic bded697f07
Make Goodbye block using hyperlinks 6 years ago
David Cernat c2411982d2 [Client] Log object refNumIndexes and mpNums in a consistent way 6 years ago
David Cernat 7775780ad7 [Cllient] Update multiplayer code for handling quick keys 6 years ago
David Cernat 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
 6 years ago
Thunderforge 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() {}
                     ^
```
 6 years ago
Finbar Crago 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...
 6 years ago
Finbar Crago 09c9bd34c3 cleanup more unnecessary struct keywords... 6 years ago
Finbar Crago 596be205c1 cleanup unnecessary struct keywords... 6 years ago
Finbar Crago 2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 6 years ago
Finbar Crago ed71656ea6 fix updateActivatedQuickKey() crash 
keyboard numbers don't start at zero...
 6 years ago
Finbar Crago 24d5fb09da fix crash on simultaneous key presses 6 years ago
Finbar Crago 80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 6 years ago
Finbar Crago 335e2c5897 add keyData struct + general cleanup 6 years ago
David Cernat 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.
 6 years ago
Finbar Crago cac6d59140 Merge branch 'master' into fix_quickkey_segfalt 6 years ago
Finbar Crago 43c9fd4cec check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips 6 years ago
Finbar Crago 186ec8c50f rm ContainerStore/refItem 6 years ago
Marc Zinnschlag 705b2dca0e Merged pull request #1777 6 years ago
Finbar Crago 46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 6 years ago
Andrei Kortunov 441463327c Validate map size 6 years ago
Capostrophic 35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 6 years ago
Finbar Crago 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...)
 6 years ago
David Cernat fd05beef94 [Client] Don't delete disposed of corpses on client 
Clients should instead await a server reply approving the deletion.
 6 years ago
Miloslav Číž d629c30fdb
Merge branch 'master' into screenshot360 6 years ago
Andrei Kortunov 61c968d550 Ignore broken items when search for replacement (bug #4453) 6 years ago
Capostrophic 1c8a20a54a Set ok button focus in settings window by default (fixes #4368) 6 years ago
Bret Curtis 7310e3c8c2
Merge pull request #1748 from akortunov/bookfix 
Do not show any book text after last <BR> tag
 6 years ago
Andrei Kortunov 66a46ff03c Do not show any book text after last <BR> tag. 6 years ago
Capostrophic d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 6 years ago
David Cernat 2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 6 years ago
Capostrophic 1a354f88ac Make choices trigger goodbye if Goodbye is used (fixes #3897) 6 years ago
Capostrophic 191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 6 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master 
Add OpenMW commits up to 27 May 2018
 6 years ago
Andrei Kortunov 1abff5365b Capitalize enchanted items names again in spells window 6 years ago
Andrei Kortunov afae398b5c Use utf8 lowercase function for journal index to avoid code duplication 6 years ago
Andrei Kortunov b5374029e5 Implement case-insensitive search in spell window 6 years ago
Andrei Kortunov 9ac752ea70 Implement filtering in the spells window 6 years ago
David Cernat 031a80ed5a [Client] Don't advance time when waiting, traveling, training or jailed 6 years ago
David Cernat 1e749938fb
Merge pull request #426 from OpenMW/master 
Add OpenMW commits up to 15 May 2018
 6 years ago
Bret Curtis c75d774356
Merge pull request #1692 from akortunov/playsound 
Prevent PlaySound overlapping
 6 years ago
David Cernat 9b9dd4abaf
Merge pull request #425 from OpenMW/master 
Add OpenMW commits up to 13 May 2018
 6 years ago
David Cernat 78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 6 years ago
David Cernat 6bf3a0be1e [General] Rename WorldPackets into ObjectPackets for clarity 6 years ago