Koncord
f814ae795d
[Master] Fix return from isServerValid()
...
Temporary accept all servers in OnServerAnnnounce
2017-09-13 19:11:58 +08:00
Koncord
838e05521e
[Master] Minor fixes
2017-09-13 17:56:38 +08: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
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
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
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
Andrei Kortunov
661232222f
Allow guards to attack fighting creatures only in fAlarmRadius range
2017-09-10 15:26:48 +04:00
Capostrophic
9503d61866
Use const nodeMap in creature animation
2017-09-09 23:22:16 +03: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
AnyOldName3
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
2017-09-08 17:26:46 +01:00
Andrei Kortunov
ac2f20f983
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:42:06 +04:00
scrawl
8f1c8759e4
Merge pull request #1432 from akortunov/alchemyfix
...
Update alchemy effects after every created potion (#4079 )
2017-09-07 20:51:42 +00:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
Andrei Kortunov
7559d25317
Update alchemy effects after every created potion ( #4079 )
2017-09-06 15:11:47 +04:00
David Cernat
b94c0a9991
[Client] Don't send Attribute & Skill packets as werewolf, part 2
2017-09-04 20:21:06 +03:00
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
David Cernat
8c9d6a0160
[Client] Ensure that LocalPlayer's isWerewolf starts out false
2017-09-04 15:44:10 +03:00
David Cernat
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
2017-09-04 15:13:05 +03:00
Thunderforge
e0ffc94f3e
Fix OpenMW-CS internal name
2017-09-02 18:07:12 -05:00
Koncord
510e657c93
Merge branch 'master' into new-script-api
2017-09-02 19:48:44 +08:00
Koncord
060ebe3d4a
[Server] Init isWerewolf variable
...
Comment unused code
2017-09-02 19:45:19 +08:00
Koncord
74c9a26d16
[Server] Fix "wrong packet with id: 14"
2017-09-02 14:01:11 +08:00
scrawl
4c5992a0d5
Warn if removing a node fails
2017-09-01 21:42:35 +00:00
scrawl
132ac6001b
Fix bug of Animation::mSkeleton not being assigned
...
This bug resulted in deactivating a Skeleton not working properly for creatures (that are out of processing range), therefore reduced performance.
2017-09-01 21:42:34 +00:00
scrawl
7a79ebb713
Merge pull request #1428 from akortunov/stancechangefixes
...
[Feedback needed] Stance switching changes, part II
2017-09-01 21:42:08 +00:00
Andrei Kortunov
7f5f5458d4
Reset player attack animation when unequip weapon or tool
2017-09-01 18:03:23 +04:00
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
2017-09-01 14:28:21 +04:00
Andrei Kortunov
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
2017-09-01 08:59:05 +04:00
scrawl
a8005c33d9
Revert unintended change to mOnGround variable that was somehow introduced with 38a2de3c51
2017-08-31 21:58:12 +00:00
David Cernat
2e8718a0e0
Merge pull request #282 from OpenMW/master
...
Add OpenMW commits up to 31 Aug 2017, part 2
2017-08-31 18:42:54 +03:00
David Cernat
3fc1bdecb3
[Client] Shorten player names to 31 characters after they are inputted
2017-08-31 18:41:37 +03:00
