krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
17039 commits 35 branches 0 tags 65 MiB
Commit graph

17039 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Cernat
e36321f448 Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-09-02 06:57:49 +03:00
David Cernat
dafc6c0843 Save and load birthsigns 2016-09-02 06:57:13 +03:00
David Cernat
9764dbb8d2 Merge pull request #52 from OpenMW/master 
Add OpenMW commits up to 2 Sep
 2016-09-02 06:29:34 +03:00
David Cernat
ff94b5f1ac Fix unsuitable variable name 2016-09-02 06:16:35 +03:00
David Cernat
941d76fce0 Fix setting of default classes and initialize classes safely on server 2016-09-02 04:31:35 +03:00
scrawl
bdf55927e1 Merge pull request #1041 from Allofich/waterwalking 
Don't allow casting Water Walking in deep water
 2016-09-02 02:57:22 +02:00
David Cernat
970e9aff2f Remove old class methods and don't include class in ID_GAME_BASE_INFO 2016-09-02 03:45:43 +03:00
Koncord
534ef527b9 Fix my stupid epic fail 2016-09-02 07:35:53 +08:00
Marc Zinnschlag
316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 2016-09-01 11:51:34 +02:00
Allofich
b99c2c54d8 Allow Water Walking on non-submerged creatures 2016-09-01 03:53:53 +09:00
Aesylwinn
c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 2016-08-31 11:02:04 -04:00
Allofich
22b11c5947 Move Water Walking check into checkEffectTarget() 2016-08-31 23:56:31 +09:00
Allofich
f25c65260c Limit sMagicinvalidEffect to self-cast spells 2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b Use castByPlayer bool 2016-08-31 17:18:23 +09:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Allofich
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
Bret Curtis
b39516466f lib was unnecessary, deps for travis included openthreads20 which is now built on ppa with osg-3.4 package. translation: fixed on ppa side 2016-08-30 20:09:28 +02:00
Bret Curtis
b67d7ec1e0 apparently the lib needs to go in as well 2016-08-30 19:12:18 +02:00
Bret Curtis
b944c8716e bump OSG to 3.4 2016-08-30 19:00:27 +02:00
Koncord
0ee5202670 Update .travis.yml 2016-08-30 22:04:58 +08:00
David Cernat
263efa9988 Fix formatting, part 2 2016-08-30 12:37:36 +03:00
David Cernat
a20e7890a2 Fix formatting 2016-08-30 10:52:30 +03:00
David Cernat
f562215d9a Merge branch 'master' of https://github.com/TES3MP/openmw-tes3mp 2016-08-30 08:55:13 +03:00
David Cernat
1f8595bf3b Save server information in a folder named data instead of files 2016-08-30 08:54:26 +03:00
Koncord
cf1a0113a1 Time API 2016-08-30 13:24:42 +08:00
David Cernat
5e6a374687 Add comment about MesssageBox to prevent future confusion 2016-08-30 08:13:08 +03:00
David Cernat
857defadbc Revert one unnecessary renaming of MessageBox 2016-08-30 08:05:00 +03:00
David Cernat
32ce7e97a8 Fix build for Windows server 2016-08-30 08:01:34 +03:00
Koncord
1186d09ec0 ScriptFunctions.hpp size reduction 2016-08-30 12:20:39 +08:00
Stanislav Zhukov
056209b26a Update README.md 2016-08-30 11:27:48 +08:00
Koncord
e7deff09d9 Update version 2016-08-30 11:27:03 +08:00
Koncord
11eae277a9 Characters Class API 
Added some new functions
 2016-08-30 11:18:19 +08:00
scrawl
b92a4f1a32 Merge pull request #1038 from ace13/win-package-fix 
Install Qt5 platform DLLs on Windows
 2016-08-29 19:21:15 +02:00
Alexander "Ace" Olofsson
c9d4ff35c4 Install Qt5 platform DLLs on Windows 2016-08-29 18:40:40 +02:00
Koncord
3405e36ce4 Woops part 2 2016-08-29 22:59:04 +08:00
David Cernat
d612cbcc7b Revert "Disable CharGen custom class choice until we can handle custom classes" 
This reverts commit e81bf7318c.
 2016-08-29 21:04:32 +08:00
Koncord
118ab32c9b Woops 2016-08-29 21:03:04 +08:00
Koncord
a661de2a84 PacketClass 2016-08-29 21:01:23 +08:00
Koncord
2054baf7d3 Simplified PacketsController 2016-08-29 20:28:56 +08:00
scrawl
20da3bc240 Merge pull request #1037 from ace13/appveyor 
Visual Studio 2015 support
 2016-08-29 12:40:09 +02:00
scrawl
4322e76cb6 Fix shadowing warnings 2016-08-29 12:38:24 +02:00
scrawl
a5da3a269e Fix shadowing warnings 2016-08-29 12:20:00 +02:00
Alexander "Ace" Olofsson
bcaf160eab Add some missing Qt DLLs 2016-08-29 07:07:50 +02:00
Alexander "Ace" Olofsson
c93f7b90c5 Disable the version changing on AppVeyor 
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
 2016-08-29 00:37:20 +02:00
Alexander "Ace" Olofsson
61d9729767 A final bit of script cleanup and caching 2016-08-29 00:29:30 +02:00
Grim Kriegor
f67bad2260 Update README.md 2016-08-28 22:50:41 +01:00
Alexander "Ace" Olofsson
6abc3c04bd One letter wrong, oops 2016-08-28 23:26:02 +02:00
Alexander "Ace" Olofsson
d781846f53 Fix the /bigobj issue and some script cleanup 
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
 2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
aa28166f2e And finally fix the build path 
Forgot how AppVeyor runs the builds, so fixed it in the wrong place
 2016-08-28 21:59:13 +02:00
Alexander "Ace" Olofsson
bc6aa86b8a And escaping the printf input 2016-08-28 21:56:53 +02:00