Commit Graph

15488 Commits (78df8c5ebeb2a5321d6a35cd101d0cd214f2e5e6)

Author SHA1 Message Date
Bret Curtis c3c3fbc68e overriden -> overridden 7 years ago
David Cernat 65d978a3cb
Merge pull request #364 from OpenMW/master
Add OpenMW commits up to 1 Jan 2017
7 years ago
David Cernat bca9c55046 [Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
This reverts commit 2f4cd6b713 and adds back the changes made by 45993d3da2 because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
7 years ago
Thunderforge 3f7143556a Providing different mappings depending on the version of SDL installed 7 years ago
Miloslav Číž 3b741dc4b7 Revert "Add slider for refraction size in settings window"
This reverts commit ee40b41285.
7 years ago
scrawl 57257d057f
Remove unintended jump cooldown (Fixes #4250) 7 years ago
David Cernat 47a3dc9ff2 [Server] Add broadcast argument to functions for sending WorldPackets 7 years ago
David Cernat 1e2517698d [Server] Send player speech and animation packets only to nearby players 7 years ago
David Cernat 2f4cd6b713 [Client] Revert "Merge pull request #1529 from drummyfish/animfix"
This reverts commit 45993d3da2, reversing
changes made to 3d347730dc.

That commit made players have to wait around 1.5 seconds after each jump before doing a new one.

It will be reinstated once its accompanying OpenMW issue at https://bugs.openmw.org/issues/4250 is fixed.
7 years ago
David Cernat db0e0d376e [Client] Use new code to set the console's Ptrs from server scripts
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
7 years ago
David Cernat 5fd9079b26 [Client] Stop drag and drop when setting player inventory 7 years ago
David Cernat 40e70ebf9c [Client] Fix key focus for chat window 7 years ago
David Cernat bed96e5a3d [Client] Remove check of GM_RestBed GUI mode that no longer exists 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago
David Cernat 993081ba1e [General] Add enchantmentCharge to worldObjects and items 7 years ago
scrawl b8c25e6bff
Use the correct priority of animation sources in getStartTime (Fixes #4263) 7 years ago
Marc Zinnschlag 7245b251e8 Merge remote-tracking branch 'drummyfish/cs-cam' 7 years ago
Marc Zinnschlag 93716cecd9 Merge remote-tracking branch 'origin/master' 7 years ago
scrawl 993982628d
Merge pull request #1590 7 years ago
Andrei Kortunov 1a58171e86 Do not allow to sell items from containers with zero capacity (bug #4268) 7 years ago
David Cernat fef6bddc68 [Client] Fix typo related to drag and dropping 7 years ago
David Cernat 535fba0cb3 [Client] Finish drag and drops when arrested or teleported by server 7 years ago
Miloslav Číž 01f9d90315 CS: Reorder 3D input menu 7 years ago
Miloslav Číž 13dc1bd41e CS: Add tooltip to camera-ortho-size preference 7 years ago
Miloslav Číž 1f5feeddb9 CS: Change camera parameter types to int 7 years ago
Miloslav Číž f2777f7242 CS: Mover object-marker-alpha under Rendering 7 years ago
Marc Zinnschlag ecf1cea1b7 Merge remote-tracking branch 'drummyfish/cs-cam' 7 years ago
Miloslav Číž 79527b746a Remove unused variable 7 years ago
Miloslav Číž b246580c63 Fix orbit camera axis 7 years ago
Andrei Kortunov ba46473038 Do not skip weather transitions from SetPos script command (bug #3603) 7 years ago
David Cernat ebf88d12a3 [Client] Send PlayerInventory packet after buying skill training 7 years ago
scrawl e9ecaf712b
Merge pull request #1584 7 years ago
scrawl 7d62f05f81
Merge pull request #1583 7 years ago
David Cernat 0ad9c99cf4 [Client] Send PlayerInventory packet after completing a vendor trade 7 years ago
Andrei Kortunov 0e04a26ef6 Set duration of magic effects from ingredients (bug #4261) 7 years ago
Andrei Kortunov c908ad2fba Do not allow to place actors underground via SetPos (bug #3783) 7 years ago
Chris Robinson 08e947319a Restore exception throwing to the decoder 7 years ago
Miloslav Číž ee40b41285 Add slider for refraction size in settings window 7 years ago
Chris Robinson 06ae61479a If a sound effect fails to load, substitute silence. 7 years ago
Miloslav Číž e309dfd234 CS: Rename variables (AppVeyor fix) 7 years ago
scrawl 9cee439e37
Merge pull request #1577 7 years ago
scrawl 1d823d8ae1
Merge pull request #1579 7 years ago
scrawl b12cd1f5b2
Merge pull request #1581 7 years ago
Miloslav Číž 199e41833f
Merge branch 'master' into cs-cam 7 years ago
Miloslav Číž d85f8deaa3 CS: Add fixed roll setting, plus ortho fix 7 years ago
Miloslav Číž 1b77e3ed62 CS: Add ortho camera setting 7 years ago
Miloslav Číž bfad5ebde4 CS: Fix camera orbit control with keys 7 years ago
Chris Robinson aecf74e7bb Don't throw exceptions from the audio decoder 7 years ago
Miloslav Číž 5e076ee015 CS: Fix camera orbit with arbitrary roll 7 years ago
Miloslav Číž cfdc6c788e CS: Make camera FOV change dynamically 7 years ago
Miloslav Číž 7d36dd68dc CS: Make orbit camera not change roll 7 years ago
Miloslav Číž 360d786ff2 CS: Add rendering prefs and camera FOV 7 years ago
Andrei Kortunov 744859f327 Take in account armor condition in the armor rating calculation (bug #4246) 7 years ago
Miloslav Číž b69c16e682 Add setting option to scale water refractions 7 years ago
Allofich 7e87ce8787 Prevent combat on/off cycling for calmed actors 7 years ago
Allofich e0c54b3f39 Stop guards trying to arrest player when calm
(Fixes #3863)
7 years ago
Andrei Kortunov a28cc37501 Do not sell ingredients from organic containers 7 years ago
Andrei Kortunov 29b2308b2c Do not display cyrillic soft/hard signs in the journal index 7 years ago
Andrei Kortunov b6ae7f3cc8 Do not add greetings to the journal index (bug #4342) 7 years ago
David Cernat e97c9f72a2 [General] Rework getting/clearing of skill modifiers as with attributes 7 years ago
David Cernat 07f0cc2b0e
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
7 years ago
scrawl ff1226c96b
Merge pull request #1575 7 years ago
Andrei Kortunov 8decd35607 Fixes crash on quickload from the container menu (bug #4239) 7 years ago
David Cernat 047ad40b96 [Client] Clear FortifyAttribute effects when server sets modifier to 0 7 years ago
David Cernat 2944be18ae [Server] Actually, turn SetAttributeModifier into ClearAttributeModifier
There's no way SetAttributeModifier() was going to make sense if, say, a player had drunk 3 different potions fortifying the same attribute and was wearing equipment fortifying it as well. How would one change the sum modifier of those while accounting for each specific effect's duration and magnitude?

The only workable solution is to allow the server to clear the modifier.
7 years ago
David Cernat ef6dc61797 [Client] Send PlayerAttribute packets when attribute modifiers change 7 years ago
David Cernat e8d636ebc3 [Server] Rework Get/SetAttributeCurrent into Get/SetAttributeModifier
As seen here, attributes don't use the concept of current values, but rather of value modifiers and value damage:

https://github.com/OpenMW/openmw/blob/master/apps/openmw/mwmechanics/stat.cpp#L217
7 years ago
David Cernat c9c363ebef [General] Allow GameSettings to set bed & wilderness resting separately 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
scrawl a4d8aef40d
Merge branch openmw-43 into master
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
7 years ago
scrawl 47a5229eed
Merge pull request #1564 7 years ago
scrawl 59bfd670c0
Merge pull request #1571 7 years ago
David Cernat 22521578eb
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
7 years ago
Grigorii Latyshev 2abb1a2ec2 Added checkMagicka parameter 7 years ago
Grigorii Latyshev 9fe5a4d236 Revert condition changes 7 years ago
Grigorii Latyshev dab72b45db Move mana reducing code back 7 years ago
Andrei Kortunov b9d9660efd Update music state in the menu mode (bug #3664) 7 years ago
Andrei Kortunov f7f8dfaf2a AiWander: do not allow flying/swimming creatures to use pathgrid 7 years ago
scrawl 9920779a7b
Merge pull request #1543 7 years ago
scrawl c50b18b3bb
Move PathgridGraph out of CellStore
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.

This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
7 years ago
scrawl 5fe68ab062
Merge pull request #1419 7 years ago
scrawl fee2e946d1
Merge pull request #1565 7 years ago
David Cernat 3508a16836 [General] Use GameSettings packet to set ability to rest and wait 7 years ago
Kyle Cooley eb23367175 Fix rendering depth/order issues 7 years ago
Grigorii Latyshev ce32462358 Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*) 7 years ago
Andrei Kortunov dea7d0beff Do not interrupt swim and sneak idle animations during attack (bug #4122) 7 years ago
Kyle Cooley c8f79ea838 Adjust rotation markers 7 years ago
scrawl 88ec6179ff
Merge pull request #1566 from akortunov/guifixes
Set default values for class and birthsign select menus
7 years ago
David Cernat 300ca905fc [Client] Don't pause game when minimizing window, despite MyGUI issues 7 years ago
Andrei Kortunov 55db3c2712 Set default values for class and birthsign select menus (bug #4226) 7 years ago
David Cernat d06817a356
Merge pull request #347 from OpenMW/master
Add OpenMW commits up to 25 Nov 2017
7 years ago
Grigorii Latyshev 32096ae0cc Fix displayed spell success chance in God Mode 7 years ago
scrawl 665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
Cyrillic journal index (bug #2485)
7 years ago
scrawl 8226c8dc92
Merge pull request #1560 from akortunov/guifixes
Fix the Topics button position if the Tribunal is not installed
7 years ago
scrawl f5c075b188
Merge pull request #1563 from drummyfish/throwfix
Make thrown projectiles rotate (#4216)
7 years ago
Grigorii Latyshev a7c953b318 Display 0 chance for spell if player does not have enought magic energy 7 years ago
David Cernat 2373be9735
Merge pull request #345 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
Miloslav Číž 4373fea21e Correct projectile rotation 7 years ago
Miloslav Číž d0a299caab Rotate thrown projectiles around the bb center 7 years ago