David Cernat
|
87ada3e763
|
[Client] Add CellController::isSameCell() and use it in LocalPlayer
|
2017-04-23 14:01:13 +03:00 |
|
Koncord
|
d1df9dde14
|
[Server] Add processors to source groups
|
2017-04-23 13:59:17 +08:00 |
|
Koncord
|
c35d5a2c6c
|
[Master] Implement Master server
|
2017-04-23 13:39:43 +08:00 |
|
Koncord
|
4c939f6d0a
|
[General] Split tes3mp components in CMakeLists by group
|
2017-04-23 13:39:43 +08:00 |
|
Koncord
|
546bb42abb
|
[General] Add Master Packets
|
2017-04-23 13:39:43 +08:00 |
|
Koncord
|
5854f680f0
|
[General] Add Master data types
|
2017-04-23 13:39:43 +08:00 |
|
Koncord
|
41005b1add
|
[General] Add orderChannel to packets
|
2017-04-23 13:39:43 +08:00 |
|
Andrei Kortunov
|
c2706ac3e7
|
Merchant repair and travel window scroll fix
|
2017-04-23 09:15:25 +04:00 |
|
Andrei Kortunov
|
bc9080d9d7
|
Removed 31 symbols cap from service menus
|
2017-04-23 08:56:54 +04:00 |
|
scrawl
|
0e37e71ea2
|
Merge pull request #1266 from akortunov/handsfallbackfix
Improved hands bodyparts selection fallback
|
2017-04-23 00:36:48 +02:00 |
|
Andrei Kortunov
|
4544caf7f3
|
Improved bodypart select fallback (fixes #2594)
|
2017-04-22 22:23:10 +04:00 |
|
scrawl
|
45d9e38616
|
Fix check for default material
|
2017-04-22 14:27:45 +02:00 |
|
David Cernat
|
4ebc9f1314
|
Merge pull request #204 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
|
2017-04-22 14:33:26 +03:00 |
|
Koncord
|
a27815fa7d
|
[General] Allow backslashes in add_component_dir to specify subgroups
|
2017-04-22 13:56:03 +08:00 |
|
MiroslavR
|
0737d6cb72
|
Merge pull request #1270 from Allofich/scriptfix
Check for NULL before running voice dialogue scripts
|
2017-04-22 01:58:20 +02:00 |
|
Allofich
|
f34e35eb19
|
Check for NULL before running voice scripts
(Fixes #3834)
|
2017-04-22 07:51:31 +09:00 |
|
David Cernat
|
a5484d237b
|
Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
|
2017-04-21 21:07:37 +03:00 |
|
scrawl
|
8fbf9dc597
|
Merge pull request #1253 from akortunov/pinned
Remember "pinned" windows across game restarts
|
2017-04-21 18:44:47 +02:00 |
|
Andrei Kortunov
|
2b3b6d558f
|
Move updatePinnedWindows() function to private section
|
2017-04-21 19:37:09 +04:00 |
|
scrawl
|
931310d2e2
|
Merge pull request #1268 from Allofich/anim
Add enabled check to animation script commands
|
2017-04-21 17:02:27 +02:00 |
|
Andrei Kortunov
|
f986e3fafa
|
Remove unused code
|
2017-04-21 18:39:01 +04:00 |
|
Allofich
|
143ee387cc
|
Add enabled check to animation script commands
(Fixes #3793)
|
2017-04-21 23:27:24 +09:00 |
|
scrawl
|
7998583a7b
|
Merge pull request #1267 from Allofich/scriptsign
Treat =< and => as == in scripts
|
2017-04-21 15:34:34 +02:00 |
|
scrawl
|
fc56fc0b81
|
Merge pull request #1265 from akortunov/develop
Use "sLevel" GMST instead of hardcoded text in load game menu
|
2017-04-21 15:30:15 +02:00 |
|
Allofich
|
e095817ac2
|
Treat =< and => as == in scripts
(Fixes #3744)
|
2017-04-21 22:26:13 +09:00 |
|
scrawl
|
2c879ddbbf
|
Merge pull request #1264 from Allofich/script
Run scripts for voiced dialogue
|
2017-04-21 15:26:09 +02:00 |
|
Andrei Kortunov
|
e717d046f2
|
Escaped class name string
|
2017-04-21 17:21:57 +04:00 |
|
scrawl
|
1956602aa2
|
Merge pull request #1262 from Allofich/warnings
Fix more warnings
|
2017-04-21 14:34:36 +02:00 |
|
Andrei Kortunov
|
f67ec9c9ce
|
Use sLevel GMST instead of hardcoded text in load game menu
|
2017-04-21 09:40:25 +04:00 |
|
David Cernat
|
fec82dc033
|
Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
|
2017-04-21 07:58:13 +03:00 |
|
Andrei Kortunov
|
6c1e3a0618
|
Merged from upstream master
|
2017-04-21 08:48:22 +04:00 |
|
Allofich
|
ff3cb18d4f
|
Fix shadowing warnings
|
2017-04-21 11:06:18 +09:00 |
|
Allofich
|
60c67bc327
|
Run scripts for voiced dialogue
(Fixes #3787)
|
2017-04-21 10:39:11 +09:00 |
|
scrawl
|
c2240e3af1
|
Call the WindowManager::updatePlayer after the startup script is run
|
2017-04-21 00:51:13 +02:00 |
|
scrawl
|
1ffb9e1bf3
|
Remove renderWorldMap()
|
2017-04-21 00:50:22 +02:00 |
|
scrawl
|
bfdde0262f
|
Merge pull request #1260 from akortunov/levitationfix
Purge existing levitation effects when levitation is disabled (fixes #3766)
|
2017-04-21 00:25:09 +02:00 |
|
scrawl
|
83dbe3ac99
|
Merge pull request #1261 from rhtucker/master
Added all settings that are in settings.cfg but were not yet documented.
|
2017-04-21 00:18:56 +02:00 |
|
scrawl
|
5eb12ea8b5
|
Merge pull request #1263 from akortunov/chargenfixes
Chargen menus fixes
|
2017-04-21 00:18:43 +02:00 |
|
Andrei Kortunov
|
c65c643abe
|
Fixed race menu skills layout
|
2017-04-20 21:30:13 +04:00 |
|
Allofich
|
ff3e307059
|
Pass parameters by const reference
|
2017-04-20 23:47:03 +09:00 |
|
David Cernat
|
10d554af5b
|
[Client] Make NPCs react to DedicatedPlayer & DedicatedActor attacks
|
2017-04-20 17:00:40 +03:00 |
|
Andrei Kortunov
|
0a90b48e60
|
Fixed progressbars layout in review menu
|
2017-04-20 17:37:37 +04:00 |
|
Andrei Kortunov
|
90d90b6d81
|
Fixed dynamic stats tooltips in review menu
|
2017-04-20 17:24:34 +04:00 |
|
Andrei Kortunov
|
39682d616c
|
Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes
|
2017-04-20 17:20:20 +04:00 |
|
Allofich
|
2e5fd74db0
|
Fix invalid iterator warning
|
2017-04-20 19:30:35 +09:00 |
|
Ryan Tucker
|
29cf296be5
|
Added all settings that are in settings.cfg but were not yet documented.
|
2017-04-19 22:28:18 -07:00 |
|
David Cernat
|
edb155869b
|
Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
|
2017-04-19 22:12:33 +03:00 |
|
David Cernat
|
6aa0fa85ab
|
[Client] Send and read ActorAttack packets
|
2017-04-19 22:10:06 +03:00 |
|
David Cernat
|
2e8714afaa
|
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
|
2017-04-19 22:06:04 +03:00 |
|
scrawl
|
df3b4fe6a5
|
Merge pull request #1259 from Allofich/warnings
Fix a few Cppcheck warnings
|
2017-04-19 20:32:40 +02:00 |
|