Commit Graph

20520 Commits (64b57983f0b85d7d4e9229a9e6d021218604087e)
 

Author SHA1 Message Date
David Cernat 64b57983f0 [General] Add TRACE log messages in player processors 7 years ago
David Cernat 606ddff813
Merge pull request #346 from TES3MP/master
Add master commits up to 24 Nov 2017
7 years ago
David Cernat 2373be9735
Merge pull request #345 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
scrawl 02b37dc036
Merge pull request #1562 from akortunov/carriage
Do not show carriage return characters
7 years ago
Andrei Kortunov 4f190bf7f4 Do not show carriage return characters (bug #3696) 7 years ago
David Cernat cac4684986 [Client] Don't force skill update on cell change
Previously, an attempt by the server to simultaneously change a player's cell and skills (as you'd expect when a player file is loaded) led to:

1) The server sending the cell packet first and the skill packet afterwards

2) The player receiving the cell packet and sending their own skill packet as part of the client's forced skill update

3) The player receiving the skill packet from the server

4) The server receiving the skill packet from the player

The result was that, if the player then left the server without sending another skill packet, the server's memory retained the skills the player had sent instead of the skills it had sent to the player.

This is the first step in a solution to that situation and similar ones.
7 years ago
David Cernat 07d75abdf8 [Server] Use consistent order for includes 7 years ago
David Cernat 1ee460bba8
Merge pull request #344 from TES3MP/master
Add master commits up to 23 Nov 2017
7 years ago
David Cernat 656453725b
Merge pull request #343 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
scrawl 2136003e1c
Reapply commit a3f821cdc which got lost in a merge 7 years ago
scrawl cd4f71d5cd
Merge pull request #1555 from akortunov/guifixes
Reworked trade window
7 years ago
Andrei Kortunov ea36956ff1 Reworked trade window 7 years ago
scrawl e840c4352f
Merge pull request #1556 from jbo-85/master
Fix search paths in FindSDL2.cmake to find SDL2 built from source
7 years ago
scrawl cc3c27f241 Clean up layout files to use Spacer class 7 years ago
scrawl a3f821cdcd Disable keyboard for trade +/- buttons
For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)
7 years ago
scrawl 9fda3b6db4 Fix NumericEditBox behavior broken by switch to std::stoi
For some reason stoi doesn't throw an error for '1foo' while 'foo1' does.

Now the edit box flat out rejects any non-digit key events.
7 years ago
scrawl 719255c5c6
Merge pull request #1557 from akortunov/journalfix
[Feedback needed] Handle 128px Tx_menubook_topics textures
7 years ago
scrawl 39a9e90b1d
Merge pull request #1553 from drummyfish/leakfix
Fix memory leak in WindowManager
7 years ago
Andrei Kortunov 60d0c83cca Handle 128px Tx_menubook_topics textures 7 years ago
jbo-85 f896c9acb6 Fix search paths in FindSDL2.cmake to find SDL2 built from source 7 years ago
David Cernat d33254f287 [Server] Rename CharClass' isDefault() into isCustom()
It was already using the logic of isCustom() by mistake.
7 years ago
David Cernat 010a80ceca [Server] Place getters and setters in consistent order 7 years ago
David Cernat 947b3f76be [Server] Replace Player's isMale() and setIsMale() with gender property
For simplicity and clarity.
7 years ago
David Cernat 6f822f54aa [Server] Make chat commands case insensitive 7 years ago
David Cernat a3e2ab4d4e [Server] Send correct packet for inventory changes 7 years ago
David Cernat 4cc0216e0a [Server] Send cell changes before position changes, and prioritize both
Previously, a script changing a player's cell and position at the same time would end up sending a position packet first and then a cell change packet that overrode the former, with the player ending up at the center of the destination cell instead of at the correct position.
7 years ago
Miloslav Číž ea2bbce68a Fix memory leak in WindowManager 7 years ago
David Cernat 80be664139 [Server] Fix skill-related script functions
Add getSkillIncrease() and setSkillIncrease() script functions to get and set the attribute bonuses received at the next level up as a result of skill increases.

Previously, getSkill() and setSkill() attempted to return and set the attribute bonuses, respectively. However, they mistakenly used a skill ID as a parameter for the attribute bonuses, when in fact npcStats.mSkillIncrease is an integer array of size 8 where the key stands for an attribute's ID. As a result, setSkill() had the unexpected side effect of messing up a player's major and minor skills because of the invalid values it was setting for npcStats.mSkillIncreases.
7 years ago
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.
7 years ago
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.
7 years ago
David Cernat b2536d5296
Merge pull request #341 from testman42/patch-1
Update scripts repo link
7 years ago
Testman 7e0662cf81
Update scripts repo link
Change repo name from PluginExamples to CoreScripts.
7 years ago
David Cernat ba161ddddd [Server] Make a few function names more consistent and fix typos 7 years ago
David Cernat 7788821a69
Merge pull request #340 from TES3MP/master
Add master commits up to 17 Nov 2017
7 years ago
David Cernat 28e1947f23 Merge pull request #339 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/engine.cpp
7 years ago
scrawl 36f4f0ef85 Don't increase simulationTime while the game is minimized (Fixes #4211) 7 years ago
David Cernat 068f733d1e
Merge pull request #338 from TES3MP/master
Add master commits up to 16 Nov 2017
7 years ago
David Cernat 5aff515d3f
Merge pull request #337 from OpenMW/master
Add OpenMW commits up to 15 Nov 2017
7 years ago
scrawl cf40d19d7d
Merge pull request #1551 from thegriglat/abs
Change abs to std::abs
7 years ago
scrawl 60fba7acd8 Fix reorder warning 7 years ago
scrawl c36d250044 Parse dialogue text for keywords after the resultscript runs (Fixes #4210) 7 years ago
scrawl 7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
7 years ago
scrawl 5a93b6a324 Enable word-wrapping for the console history 7 years ago
Grigorii Latyshev 6e4f6c4bd5 Change abs to std::abs 7 years ago
David Cernat 1272b03f25 [Server] Fix typo in player script function 7 years ago
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.
7 years ago
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.
7 years ago
David Cernat ac7a588632 [General] Update config files 7 years ago
David Cernat a21f5d18d6
Merge pull request #336 from TES3MP/master
Add master commits up to 12 Nov 2017
7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago