Stanislav Zhukov
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
2017-09-14 02:38:27 +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
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
scrawl
a7cecd491c
Merge pull request #1433 from akortunov/factionfix
...
Use base skill value when calculating rank requirements
2017-09-07 20:51:18 +00:00
Andrei Kortunov
dc0313a36f
Use base skill value when calculating rank requirements
2017-09-07 21:06:10 +04:00
Andrei Kortunov
538498230b
Declare mClient variable
2017-09-06 15:59:54 +04:00
Andrei Kortunov
7559d25317
Update alchemy effects after every created potion ( #4079 )
2017-09-06 15:11:47 +04:00
scrawl
dca31b7ffa
Remove redundant _boundingBoxComputed which no longer exists in osg master ( Fixes #4075 )
2017-09-04 19:35:42 +00: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
Stanislav Zhukov
3ba6a0e000
Merge pull request #284 from Johnnynator/desktop
...
[General] Add .desktop file for Server Browser
2017-09-04 21:58:10 +08: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
Koncord
f5e23d5fc6
[General] Empty strings should be sent too
2017-09-04 04:03:02 +08:00
scrawl
84bbb83109
Merge pull request #1431 from Thunderforge/adding-note-about-reflect-actors
...
Documentation: Adding that Reflect Actors can be toggled in the video panel
2017-09-03 14:16:54 +00:00
scrawl
2e58024f1c
Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable.
2017-09-03 14:14:15 +00:00
Koncord
d904628103
[General] Avoid limitation of 512 symbols in RakString Ctor
2017-09-03 18:53:45 +08:00
Thunderforge
10fff499a2
Adding that Reflect Actors can be toggled in the video panel
2017-09-02 19:02:55 -05:00
scrawl
7441f80e4c
Merge pull request #1430 from Thunderforge/Bug-#4027-fix-OpenMW-CS-name
...
Fix OpenMW-CS internal name
2017-09-02 23:26:46 +00:00
Thunderforge
e0ffc94f3e
Fix OpenMW-CS internal name
2017-09-02 18:07:12 -05:00
John
0060e457a6
[General] Add .desktop file for Server Browser
2017-09-02 16:30:52 +02:00
Koncord
74c9a26d16
[Server] Fix "wrong packet with id: 14"
2017-09-02 14:01:11 +08:00
scrawl
5e790b567e
Fix node path issue
...
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
2017-09-01 22:12:40 +00:00
scrawl
4bef8260ab
Add const qualifiers
2017-09-01 21:42:36 +00:00
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
2017-09-01 21:42:36 +00:00
scrawl
f1ebb129c1
Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry
2017-09-01 21:42:35 +00:00
