David Cernat
98195b5e3c
Merge pull request #289 from TES3MP/master
...
Add master commits up to 15 Sep 2017
2017-09-15 03:32:20 +03:00
David Cernat
c98e6dc833
Merge pull request #288 from OpenMW/master
...
Add OpenMW commits up to 14 Sep 2017
2017-09-15 03:30:20 +03:00
Bret Curtis
e517ad3f7b
add ktx support for splashscreens
2017-09-14 10:06:36 +02:00
scrawl
5817674651
Merge pull request #1452 from psi29a/loading_screens
...
add support for png and dds splashscreens
2017-09-13 23:10:00 +00:00
Stanislav Zhukov
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
2017-09-14 02:38:27 +08:00
Bret Curtis
dff0a766a8
adding 3 more extensions
2017-09-13 15:30:22 +02:00
Koncord
3124e627cf
[General] Move hack back to the right place
2017-09-13 21:30:16 +08:00
Koncord
c2286482ae
[Master] Add 'savebans' command to RESTful API
2017-09-13 20:33:42 +08:00
Bret Curtis
b26887ef9b
add support for png and dds splashscreens to begin with.
2017-09-13 13:52:05 +02:00
Koncord
f814ae795d
[Master] Fix return from isServerValid()
...
Temporary accept all servers in OnServerAnnnounce
2017-09-13 19:11:58 +08:00
David Walley
7e83caab11
Manual modding - extend mod installation instructions ( #1448 )
...
Add section on .bsa files
Extend plugins to include .esm files
Fix typo propper->proper.
2017-09-13 11:11:01 +00:00
Koncord
50ef9677fe
[Master] Fix master.lua
...
Remove unban() from loadBans()
Disable strict json order from saveBans()
2017-09-13 17:59:07 +08:00
Koncord
838e05521e
[Master] Minor fixes
2017-09-13 17:56:38 +08:00
David Cernat
cccbe753d7
[General] Update version to 0.7-alpha
2017-09-13 10:29:36 +03:00
Koncord
6decd148e5
[Server] Fix build on Windows
2017-09-13 11:06:53 +08:00
Koncord
045dc566ea
Merge branch 'master' into new-script-api
2017-09-12 21:41:25 +08:00
Koncord
bb183457a6
[Master] Init BanAddress/UnbanAddress before opening script
2017-09-12 21:30:37 +08:00
Koncord
dc18916f46
[Master] Add isServerValid lambda. Add "OnServerAnnounce" callback
2017-09-12 21:29:42 +08:00
Koncord
f99dafbf51
[Master] Add scripts for generating certificates for testing purposes
2017-09-12 21:27:07 +08:00
Koncord
aee6fb1265
[Master] Add master lua scripts
2017-09-12 21:24:06 +08:00
Koncord
d1388cdf84
[Master] Add Admin Rest Server
...
Add admin rest callback - "OnAdminRequest". Called on every POST request
2017-09-12 20:56:21 +08:00
Koncord
b869fe0b76
[Master] Add Lua
...
Init master server values by config table in script
Add BanAddress/UnbanAddress to lua
Fix a couple of indents
Pass lua script as first launch parameter of master server
2017-09-12 20:50:28 +08:00
Koncord
0e2817da88
[Master] Move response stuff to ResponseUtils.hpp
2017-09-12 20:39:27 +08:00
Koncord
fc8232f943
[Master] Add ban/unban functions
2017-09-12 20:24:50 +08:00
Koncord
26324c2578
[Master] Change Ban structure to vector<string>
2017-09-12 20:23:17 +08:00
Koncord
4e93905350
[Master] Backport SimpleWeb
2017-09-12 20:21:32 +08:00
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03:00
scrawl
bd667c3847
Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir
...
If CMake supports it, sets the debugger working directory for Visual …
2017-09-11 10:30:50 +00:00
scrawl
00ae9a01a1
Merge pull request #1445 from akortunov/guifixes
...
Allow to add levelup a description for levels > 20
2017-09-11 10:28:09 +00:00
scrawl
407640322d
Merge pull request #1439 from akortunov/resistfix
...
Take in account elemental shields for GetResist and SetResist script commands
2017-09-11 10:27:47 +00:00
Marc Zinnschlag
5904e5a267
updated credits file
2017-09-11 10:47:35 +02:00
Marc Zinnschlag
9a8a4c744f
Merge remote-tracking branch 'capostrophic/controlplus'
2017-09-11 10:46:34 +02:00
Andrei Kortunov
7760e4514c
Allow to add levelup a description for levels > 20
2017-09-10 22:47:34 +04:00
scrawl
7688696765
Merge pull request #1437 from Capostrophic/nodemapfix
...
Use constant nodeMap during part updating in creature animation
2017-09-10 18:15:20 +00:00
Andrei Kortunov
c6fd75bf42
Take in account elemental shields for GetResist and SetResist script commands (bug #4093 )
2017-09-10 22:05:58 +04:00
Capostrophic
97ff24b8d6
Change ctl to ctrl in OpenMW-CS shortcut manager
2017-09-10 20:48:09 +03:00
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
2017-09-10 18:30:10 +01:00
scrawl
618ec6dcdd
Merge pull request #1440 from akortunov/guardfix
...
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 17:06:14 +00:00
scrawl
dcb2e20a55
Merge pull request #1436 from MiroslavR/missing-bookart
...
Log a warning in case of missing bookart instead of showing a pink rectangle
2017-09-10 16:59:02 +00:00
Andrei Kortunov
661232222f
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 15:26:48 +04:00
AnyOldName3
de14e43680
Seemingly fix everything by setting policies that were unset upon entering the macro
2017-09-10 03:18:22 +01:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03:00
AnyOldName3
33c77d7a2a
Try using cmake_parse_arguments to make the macro work
2017-09-09 17:22:55 +01:00
krizd
c9f099ce07
Change CMake version check to include 3.8
2017-09-09 03:06:03 +01:00
AnyOldName3
a9b95596bc
Add a missed trailing new line.
2017-09-08 22:21:00 +01:00
AnyOldName3
8c74f16247
Restore trailing new lines to shrink PR
2017-09-08 22:20:04 +01:00
AnyOldName3
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
2017-09-08 22:17:42 +01:00
MiroslavR
1e585ac71a
Log a warning in case of missing bookart instead of showing a pink rectangle ( Fixes #3826 )
2017-09-08 22:50:07 +02:00
scrawl
335ecd1162
Merge pull request #1434 from akortunov/guifixes
...
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:14:52 +00:00
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
2017-09-08 17:26:46 +01:00
