Commit graph

20667 commits

Author SHA1 Message Date
David Cernat
57a0415ba3 [Server] Send level packets in Player's update() at the appropriate time
Previously, trying to send a level packet after base info and character class packets in a script actually led to the level packet being sent first and then being overridden by the others, with the player ending up at level 1 on their client.
2017-11-18 03:55:17 +02:00
David Cernat
494b10b97e [Server] Send player packets in a more appropriate order
Previously, the fact that a character class packet got sent after a dynamic stats packet caused the dynamic stats to get overridden on the client by the class change.
2017-11-18 01:47:18 +02:00
David Cernat
b2536d5296
Merge pull request #341 from testman42/patch-1
Update scripts repo link
2017-11-17 18:48:06 +02:00
Testman
7e0662cf81
Update scripts repo link
Change repo name from PluginExamples to CoreScripts.
2017-11-17 11:14:33 +01:00
David Cernat
ba161ddddd [Server] Make a few function names more consistent and fix typos 2017-11-17 04:12:25 +02:00
David Cernat
7788821a69
Merge pull request #340 from TES3MP/master
Add master commits up to 17 Nov 2017
2017-11-17 01:28:07 +02:00
David Cernat
28e1947f23 Merge pull request #339 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/engine.cpp
2017-11-17 01:26:31 +02:00
scrawl
36f4f0ef85 Don't increase simulationTime while the game is minimized (Fixes #4211) 2017-11-16 18:48:49 +00:00
David Cernat
068f733d1e
Merge pull request #338 from TES3MP/master
Add master commits up to 16 Nov 2017
2017-11-16 08:50:27 +02:00
David Cernat
5aff515d3f
Merge pull request #337 from OpenMW/master
Add OpenMW commits up to 15 Nov 2017
2017-11-16 08:49:56 +02:00
scrawl
cf40d19d7d
Merge pull request #1551 from thegriglat/abs
Change abs to std::abs
2017-11-15 17:34:59 +00:00
scrawl
35d68f038d Update dialogue topics list after result script is run
Regression from 0.42.
2017-11-15 17:20:40 +00:00
scrawl
60fba7acd8 Fix reorder warning 2017-11-15 17:20:08 +00:00
scrawl
c36d250044 Parse dialogue text for keywords after the resultscript runs (Fixes #4210) 2017-11-15 17:20:06 +00:00
scrawl
7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
2017-11-15 17:20:06 +00:00
scrawl
5a93b6a324 Enable word-wrapping for the console history 2017-11-15 17:20:05 +00:00
Grigorii Latyshev
6e4f6c4bd5 Change abs to std::abs 2017-11-13 21:36:55 +01:00
David Cernat
1272b03f25 [Server] Fix typo in player script function 2017-11-13 07:43:20 +02:00
David Cernat
b4e8560698 [Client] Send cell states correctly after inputting name
Previously, initial cell states were sent in LocalPlayer::processCharGen() and were ignored by the server because the player was not yet regarded as loaded. The result was that existing players logging in could not see each other until they went through at least one cell change.
2017-11-13 05:38:56 +02:00
David Cernat
926106cf8c [General] Rework CharGen slightly for clarity purposes
Previously, charGenStage.end was doing double duty as both the variable indicating the number of CharGen stages and – when set to 0 – the variable indicating that CharGen was over. The latter role is now filled by a new boolean.
2017-11-13 05:33:27 +02:00
David Cernat
ac7a588632 [General] Update config files 2017-11-13 02:18:58 +02:00
David Cernat
a21f5d18d6
Merge pull request #336 from TES3MP/master
Add master commits up to 12 Nov 2017
2017-11-12 06:37:34 +02:00
David Cernat
2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
2017-11-12 06:35:15 +02:00
David Cernat
a8261bb385 [General] Fix printing of packet identifiers after changes to logger 2017-11-12 02:36:18 +02:00
Alexander Stillich
93e9df15c9 Fixed parameter naming 2017-11-11 22:58:02 +00:00
Alexander Stillich
52b3507a2b Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-11 22:58:02 +00:00
Alexander Stillich
09aac22782 Added StringUtil::replaceAll() 2017-11-11 22:58:01 +00:00
Alexander Stillich
92aaff3b78 Fixed escaping @ in boost program options filter 2017-11-11 22:57:59 +00:00
scrawl
a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)
2017-11-11 22:30:59 +00:00
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
2017-11-11 22:12:07 +00:00
scrawl
ae9f79c192
Merge pull request #1550 from akortunov/trackingfix
Do not track a nearest actor during combat and pursue
2017-11-11 22:10:33 +00:00
scrawl
dc016059c3 Disable Activate key when textinput is active (Bug #4151) 2017-11-11 22:00:18 +00:00
scrawl
3b9e1e8c1b Make movement keys not function in text input mode 2017-11-11 22:00:09 +00:00
scrawl
b7eda61f7a Fix overlapping widgets in trade window layout (Fixes #4205) 2017-11-11 21:59:21 +00:00
Andrei Kortunov
8c0dcd8b2b Do not track a nearest actor during combat and pursue (bug #4179) 2017-11-11 19:46:59 +04:00
rexelion
f0649849b8 changed variable name to be more descriptive 2017-11-11 12:00:23 +00:00
Andrei Kortunov
9943bd4d74 AiWander fast forwarding improvements (bug #3638) 2017-11-11 15:31:06 +04:00
Andrei Kortunov
03f129b53c remove redundant allowedToInsertItems() function from ItemModel 2017-11-11 11:58:22 +04:00
Andrei Kortunov
99517d83ea Bound items detection refactoring 2017-11-11 11:58:22 +04:00
Andrei Kortunov
a02124f884 Handle item owners during pickpocketing 2017-11-11 11:58:18 +04:00
David Cernat
700e4d032e
Merge pull request #334 from TES3MP/master
Add master commits up to 11 Nov 2017
2017-11-11 03:47:22 +02:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
Add OpenMW commits up to 11 Nov 2017
2017-11-11 03:46:21 +02:00
scrawl
a5ba1caed1
Merge pull request #1541 from astillich/4189
Fixed escaping @ in boost program options filter
2017-11-10 23:08:54 +00:00
scrawl
f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 2017-11-10 22:54:53 +00:00
scrawl
a5adc5b018 Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 2017-11-10 22:51:32 +00:00
scrawl
b06512a60d Fix error message that referred to the wrong file (Bug #4159) 2017-11-10 22:51:32 +00:00
scrawl
1afbf99f74 Make movement keys not function in text input mode 2017-11-10 22:51:31 +00:00
scrawl
b9baee51d5 Fix overlapping widgets in trade window layout (Fixes #4205) 2017-11-10 22:51:29 +00:00
rexelion
69a56eaea3 don't initialise rangeAttackOfTarget 2017-11-10 10:44:53 +00:00
Kyle Cooley
1cd539bad2 Fix render order for markers 2017-11-10 02:06:06 -05:00