Commit graph

20870 commits

Author SHA1 Message Date
David Cernat
bce3d0eb4c [Client] Use more descriptive message for version mismatch 2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62 Update android port. 2018-01-16 00:11:27 -05:00
Thunderforge
36843ed31e Adding a tutorial for placing the ring in plain sight (#1598)
* Rearranging sections

* Adding instructions to place the ring in plain sight
2018-01-15 07:51:57 +01:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top (Fixes #4298) 2018-01-14 00:27:53 +00:00
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST (Fixes #4269) 2018-01-14 00:27:05 +00:00
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269) 2018-01-14 00:26:37 +00:00
scrawl
047c44f265
Ignore duplicate data directories to work around the fallout of (Fixes #3557) 2018-01-14 00:25:20 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557) 2018-01-14 00:24:30 +00:00
scrawl
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found 2018-01-14 00:23:29 +00:00
scrawl
4a96934f56
Merge pull request #1596 2018-01-14 00:22:56 +00:00
Marc Zinnschlag
2dff3aab22 allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061 2018-01-12 16:37:06 +01:00
Andrei Kortunov
eccb49da18 Do not summon the bound bow if there is no suitable ammo 2018-01-11 21:08:30 +04:00
Andrei Kortunov
b995617559 implement rateAmmo() function 2018-01-11 21:08:11 +04:00
Koncord
05fac2f67d [Browser] Disable connect button by default 2018-01-11 20:35:37 +08:00
Koncord
043eb224e2 [Browser] Cast QStrings to UTF-8 instead Latin1 2018-01-11 20:35:13 +08:00
Koncord
35b771b19e [Browser] Rework Connect window 2018-01-11 20:34:17 +08:00
scrawl
dd5ebe225b
Merge pull request #1580 2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts 2018-01-11 01:48:05 +00:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly 2018-01-11 01:47:42 +00:00
David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
Add 0.6.2 commits up to 10 Jan 2018
2018-01-10 03:51:07 +02:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
2018-01-10 03:49:53 +02:00
scrawl
c7f60a6dc8
Merge pull request #1595 2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595"
This reverts commit 7ef7b1a7b1, reversing
changes made to 9e7e4de0ab.
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595 2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594 2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881 Remove the 'Screenshot saved' message (bug #4191) 2018-01-08 13:12:12 +04:00
Koncord
1de9f30449 [Server] Fix iterating killed timers when kill() called in the callback
Instance new timers before new tick
2018-01-08 12:24:36 +08:00
David Cernat
8316ec0fa7 [Client] Update tes3mp change comment for object rescaling 2018-01-08 02:19:05 +02:00
David Cernat
09548d05f7 [Client] Ignore cell changes that move actors to where they already are 2018-01-08 01:37:01 +02:00
David Cernat
4a9a628a0f [Client] When getting an actor, make sure their cell is initialized 2018-01-07 02:35:30 +02:00
David Cernat
45d3b24c17
Merge pull request #367 from Aesylwinn/LibIssues
Refine CMake scripts and fix g++ 5 build
2018-01-07 00:48:35 +02:00
David Cernat
4caf7ca30a [Client] Add temporary fix for crashes caused by custom GUI elements 2018-01-06 20:16:32 +02:00
David Cernat
0cc86c04d1 [Client] Print plugin discrepancies, not just plugin lists side by side 2018-01-06 05:39:25 +02:00
Kyle Cooley
7248a5d037 Remove some duplication, standardize sol2 header inclusion 2018-01-05 20:25:57 -05:00
Kyle Cooley
ba4d2bd5fe Merge remote-tracking branch 'origin/master' into LibIssues 2018-01-05 17:35:47 -05:00
David Cernat
b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
2018-01-05 21:24:14 +02:00
Kyle Cooley
fcd4d8b842 Fix build for gcc-5.4.0 2018-01-04 21:41:00 -05:00
Kyle Cooley
e2103d0bea Clean up find file for LuaJit, add one for Sol2 2018-01-04 21:40:17 -05:00
Koncord
35922e4898 [General] Change "enum ACTOR_ACTION" to "enum class Action" 2018-01-05 09:40:11 +08:00
Koncord
ef0384b296 [General] Simplify ProxyMasterPacket 2018-01-05 09:06:24 +08:00
Koncord
5b8f4f3e92 [Browser] Stop PingHelper on refresh 2018-01-05 08:38:40 +08:00
Koncord
647661daf9 [General] Minor fixes in Master packets 2018-01-05 08:38:40 +08:00
David Cernat
a639d3494a [Client] Fix use of DedicatedPlayers as targets for ConsoleCommand 2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1 [Client] Clean up GUIChat slightly 2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
David Cernat
2f6e3b4cda [Documentation] Clarify status of version 0.7 2018-01-04 10:54:40 +02:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28 [Server] Add script functions to set & get plugin enforcement state 2018-01-02 16:33:18 +02:00