Commit Graph

15409 Commits (1ee460bba8719c2527bd0e6c79efe79724e55e83)

Author SHA1 Message Date
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 719255c5c6
Merge pull request #1557 from akortunov/journalfix
[Feedback needed] Handle 128px Tx_menubook_topics textures
7 years ago
Andrei Kortunov 60d0c83cca Handle 128px Tx_menubook_topics textures 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 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
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 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
David Cernat a8261bb385 [General] Fix printing of packet identifiers after changes to logger 7 years ago
scrawl a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)
7 years ago
scrawl 98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
7 years ago
Andrei Kortunov 8c0dcd8b2b Do not track a nearest actor during combat and pursue (bug #4179) 7 years ago
rexelion f0649849b8 changed variable name to be more descriptive 7 years ago
Andrei Kortunov 03f129b53c remove redundant allowedToInsertItems() function from ItemModel 7 years ago
Andrei Kortunov 99517d83ea Bound items detection refactoring 7 years ago
Andrei Kortunov a02124f884 Handle item owners during pickpocketing 7 years ago
David Cernat 700e4d032e
Merge pull request #334 from TES3MP/master
Add master commits up to 11 Nov 2017
7 years ago
David Cernat 01db219de4
Merge pull request #333 from OpenMW/master
Add OpenMW commits up to 11 Nov 2017
7 years ago
scrawl f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 7 years ago
scrawl b06512a60d Fix error message that referred to the wrong file (Bug #4159) 7 years ago
scrawl 1afbf99f74 Make movement keys not function in text input mode 7 years ago
rexelion 69a56eaea3 don't initialise rangeAttackOfTarget 7 years ago
Andrei Kortunov 3694b6ec90 Move onClose() check to item models 7 years ago
Andrei Kortunov ac33ff9482 Move onDropItem() check to item models 7 years ago
Andrei Kortunov 3604b73d60 Move onTakeItem() to item models 7 years ago
David Cernat 4dbada69bf Merge pull request #332 from TES3MP/master while resolving conflicts 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
rexelion 983c33c4c8 don't use a pointer for ActionWeapon 7 years ago