Commit Graph

20487 Commits (7788821a696f2f0d2e4b5852ca88fb4467a4d255)
 

Author SHA1 Message Date
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
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
scrawl ae9f79c192
Merge pull request #1550 from akortunov/trackingfix
Do not track a nearest actor during combat and pursue
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 a5ba1caed1
Merge pull request #1541 from astillich/4189
Fixed escaping @ in boost program options filter
7 years ago
scrawl f1aeb416ec Disable Activate key when textinput is active (Bug #4151) 7 years ago
scrawl a5adc5b018 Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 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
scrawl b9baee51d5 Fix overlapping widgets in trade window layout (Fixes #4205) 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
scrawl 9ecdcc187f Clarify a warning message refers to inventory objects 7 years ago
scrawl 95b3c1181a Update shader with a non-color tracking material when equipment is changed during chameleon/invisibility effects (Fixes #4190) 7 years ago
scrawl e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 7 years ago
scrawl 244cc5b861 Reduce error spam 7 years ago
scrawl 7b4add2ae4 Fall back to non-shader material if creating the shader fails
Also fixes an uncaught exception that will break the whole game.
7 years ago
Alexander Stillich 43b5c2e36b Fixed parameter naming 7 years ago
Alexander Stillich 70d578d050 Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 7 years ago
Alexander Stillich af3e1f92ec Added StringUtil::replaceAll() 7 years ago
rexelion cab0002461 Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents 7 years ago