David Cernat
5894ffae7d
[Client] Ignore dynamic object placements or spawns in packets
2018-01-17 11:01:31 +02:00
David Cernat
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
2018-01-17 08:10:49 +02:00
David Cernat
f746958afa
[Client] Send enchantmentCharge for items added or removed in containers
2018-01-17 08:10:49 +02:00
David Cernat
bce3d0eb4c
[Client] Use more descriptive message for version mismatch
2018-01-17 08:10:49 +02:00
Bret Curtis
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
2018-01-16 11:12:21 +01:00
Ilya Zhuravlev
d2121ccd62
Update android port.
2018-01-16 00:11:27 -05:00
Daniel Vukelich
f09fd6795c
Follow openmw style guide
2018-01-14 11:57:11 -05:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top ( Fixes #4298 )
2018-01-14 00:27:53 +00:00
scrawl
e2e48e0a50
Add default value for 'sAnd' GMST ( Fixes #4269 )
2018-01-14 00:27:05 +00:00
scrawl
d9d8de3061
Catch exceptions in updateWindowManager (Bug #4269 )
2018-01-14 00:26:37 +00:00
scrawl
80f7279a4d
Change default installation directory from 'data' to 'basedata' (Bug #3557 )
2018-01-14 00:24:30 +00:00
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
2018-01-12 20:09:39 -05:00
Andrei Kortunov
eccb49da18
Do not summon the bound bow if there is no suitable ammo
2018-01-11 21:08:30 +04:00
Andrei Kortunov
b995617559
implement rateAmmo() function
2018-01-11 21:08:11 +04:00
scrawl
dd5ebe225b
Merge pull request #1580
2018-01-11 01:54:28 +00:00
scrawl
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
2018-01-11 01:49:35 +00:00
scrawl
1522bda60b
Fix crash in getDistance when invoked before the game starts
2018-01-11 01:48:05 +00:00
scrawl
83726ee06a
Fix Reset Controls button not functioning properly
2018-01-11 01:47:42 +00:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
2018-01-10 03:49:53 +02:00
scrawl
c7f60a6dc8
Merge pull request #1595
2018-01-09 13:48:07 +00:00
scrawl
f6ca7295a6
Revert "Merge pull request #1595 "
...
This reverts commit 7ef7b1a7b19e7e4de0ab
2018-01-09 13:47:57 +00:00
scrawl
7ef7b1a7b1
Merge pull request #1595
2018-01-09 00:42:27 +00:00
scrawl
9e7e4de0ab
Merge pull request #1594
2018-01-09 00:42:20 +00:00
Andrei Kortunov
dba071f881
Remove the 'Screenshot saved' message (bug #4191 )
2018-01-08 13:12:12 +04:00
David Cernat
8316ec0fa7
[Client] Update tes3mp change comment for object rescaling
2018-01-08 02:19:05 +02:00
David Cernat
09548d05f7
[Client] Ignore cell changes that move actors to where they already are
2018-01-08 01:37:01 +02:00
David Cernat
4a9a628a0f
[Client] When getting an actor, make sure their cell is initialized
2018-01-07 02:35:30 +02:00
David Cernat
4caf7ca30a
[Client] Add temporary fix for crashes caused by custom GUI elements
2018-01-06 20:16:32 +02:00
David Cernat
0cc86c04d1
[Client] Print plugin discrepancies, not just plugin lists side by side
2018-01-06 05:39:25 +02:00
David Cernat
a639d3494a
[Client] Fix use of DedicatedPlayers as targets for ConsoleCommand
2018-01-05 01:24:15 +02:00
David Cernat
502df7d9c1
[Client] Clean up GUIChat slightly
2018-01-05 00:03:05 +02:00
David Cernat
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
2018-01-04 12:12:18 +02:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
David Cernat
1cf2f35a28
[Server] Add script functions to set & get plugin enforcement state
2018-01-02 16:33:18 +02:00
Andrei Kortunov
b277b83810
Display the 'Screenshot saved' message after the screenshot saving (bug #4191 )
2018-01-02 14:52:42 +04:00
Bret Curtis
c3c3fbc68e
overriden -> overridden
2018-01-02 11:42:08 +01:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
David Cernat
bca9c55046
[Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 2f4cd6b71345993d3da2https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
2018-01-02 07:47:27 +02:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
2018-01-01 13:28:14 +01:00
scrawl
57257d057f
Remove unintended jump cooldown ( Fixes #4250 )
2017-12-31 23:48:51 +00:00
David Cernat
47a3dc9ff2
[Server] Add broadcast argument to functions for sending WorldPackets
2017-12-30 21:52:30 +02:00
David Cernat
1e2517698d
[Server] Send player speech and animation packets only to nearby players
2017-12-29 06:17:45 +02:00
David Cernat
2f4cd6b713
[Client] Revert "Merge pull request #1529 from drummyfish/animfix"
...
This reverts commit 45993d3da23d347730dchttps://bugs.openmw.org/issues/4250 is fixed.
2017-12-26 19:27:13 +02:00
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).
2017-12-26 15:04:28 +02:00
David Cernat
5fd9079b26
[Client] Stop drag and drop when setting player inventory
2017-12-25 05:41:13 +02:00
David Cernat
40e70ebf9c
[Client] Fix key focus for chat window
2017-12-25 05:08:36 +02:00
David Cernat
bed96e5a3d
[Client] Remove check of GM_RestBed GUI mode that no longer exists
2017-12-25 03:26:28 +02:00
David Cernat
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
2017-12-25 02:25:01 +02:00
David Cernat
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
2017-12-25 02:03:02 +02:00
David Cernat
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
2017-12-23 13:16:38 +02:00
scrawl
b8c25e6bff
Use the correct priority of animation sources in getStartTime ( Fixes #4263 )
2017-12-21 14:49:09 +00:00
Marc Zinnschlag
7245b251e8
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-19 17:01:13 +01:00
Marc Zinnschlag
93716cecd9
Merge remote-tracking branch 'origin/master'
2017-12-19 17:01:03 +01:00
scrawl
993982628d
Merge pull request #1590
2017-12-18 20:41:12 +00:00
Andrei Kortunov
1a58171e86
Do not allow to sell items from containers with zero capacity (bug #4268 )
2017-12-17 18:09:25 +04:00
David Cernat
fef6bddc68
[Client] Fix typo related to drag and dropping
2017-12-16 23:19:54 +02:00
David Cernat
535fba0cb3
[Client] Finish drag and drops when arrested or teleported by server
2017-12-16 07:21:02 +02:00
Miloslav Číž
01f9d90315
CS: Reorder 3D input menu
2017-12-15 17:22:32 +01:00
Miloslav Číž
13dc1bd41e
CS: Add tooltip to camera-ortho-size preference
2017-12-15 14:56:03 +01:00
Miloslav Číž
1f5feeddb9
CS: Change camera parameter types to int
2017-12-15 14:46:23 +01:00
Miloslav Číž
f2777f7242
CS: Mover object-marker-alpha under Rendering
2017-12-15 14:36:12 +01:00
Marc Zinnschlag
ecf1cea1b7
Merge remote-tracking branch 'drummyfish/cs-cam'
2017-12-15 13:41:54 +01:00
Miloslav Číž
79527b746a
Remove unused variable
2017-12-14 17:29:24 +01:00
Miloslav Číž
b246580c63
Fix orbit camera axis
2017-12-13 20:08:38 +01:00
Andrei Kortunov
ba46473038
Do not skip weather transitions from SetPos script command (bug #3603 )
2017-12-13 10:53:23 +04:00
David Cernat
ebf88d12a3
[Client] Send PlayerInventory packet after buying skill training
2017-12-13 05:46:48 +02:00
scrawl
e9ecaf712b
Merge pull request #1584
2017-12-12 20:11:05 +00:00
scrawl
7d62f05f81
Merge pull request #1583
2017-12-12 20:10:59 +00:00
David Cernat
0ad9c99cf4
[Client] Send PlayerInventory packet after completing a vendor trade
2017-12-12 15:18:56 +02:00
Andrei Kortunov
0e04a26ef6
Set duration of magic effects from ingredients (bug #4261 )
2017-12-10 16:10:44 +04:00
Andrei Kortunov
c908ad2fba
Do not allow to place actors underground via SetPos (bug #3783 )
2017-12-10 14:38:02 +04:00
Chris Robinson
08e947319a
Restore exception throwing to the decoder
2017-12-09 11:00:56 -08:00
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
2017-12-09 14:03:56 +01:00
Chris Robinson
06ae61479a
If a sound effect fails to load, substitute silence.
2017-12-08 22:10:09 -08:00
Miloslav Číž
e309dfd234
CS: Rename variables (AppVeyor fix)
2017-12-08 22:06:03 +01:00
scrawl
9cee439e37
Merge pull request #1577
2017-12-08 20:00:58 +00:00
scrawl
1d823d8ae1
Merge pull request #1579
2017-12-08 20:00:26 +00:00
scrawl
b12cd1f5b2
Merge pull request #1581
2017-12-08 20:00:15 +00:00
Miloslav Číž
199e41833f
Merge branch 'master' into cs-cam
2017-12-08 20:56:05 +01:00
Miloslav Číž
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
2017-12-08 20:51:40 +01:00
Miloslav Číž
1b77e3ed62
CS: Add ortho camera setting
2017-12-08 18:18:27 +01:00
Miloslav Číž
bfad5ebde4
CS: Fix camera orbit control with keys
2017-12-08 17:42:20 +01:00
Chris Robinson
aecf74e7bb
Don't throw exceptions from the audio decoder
2017-12-08 07:00:04 -08:00
Miloslav Číž
5e076ee015
CS: Fix camera orbit with arbitrary roll
2017-12-08 00:19:05 +01:00
Miloslav Číž
cfdc6c788e
CS: Make camera FOV change dynamically
2017-12-08 00:05:50 +01:00
Miloslav Číž
7d36dd68dc
CS: Make orbit camera not change roll
2017-12-07 23:52:05 +01:00
Miloslav Číž
360d786ff2
CS: Add rendering prefs and camera FOV
2017-12-07 23:48:34 +01:00
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +04:00
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
2017-12-06 20:39:09 +01:00
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
2017-12-06 01:03:24 +09:00
Allofich
e0c54b3f39
Stop guards trying to arrest player when calm
...
(Fixes #3863 )
2017-12-05 23:53:02 +09:00
Andrei Kortunov
a28cc37501
Do not sell ingredients from organic containers
2017-12-05 10:24:58 +04:00
Andrei Kortunov
29b2308b2c
Do not display cyrillic soft/hard signs in the journal index
2017-12-04 22:42:17 +04:00
Andrei Kortunov
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
2017-12-04 22:42:10 +04:00
David Cernat
e97c9f72a2
[General] Rework getting/clearing of skill modifiers as with attributes
2017-12-04 15:06:27 +02:00
David Cernat
07f0cc2b0e
Merge pull request #353 from OpenMW/master
...
Add OpenMW commits up to 4 Dec 2017
2017-12-04 04:38:38 +02:00
scrawl
ff1226c96b
Merge pull request #1575
2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607
Fixes crash on quickload from the container menu (bug #4239 )
2017-12-03 21:49:13 +04:00
David Cernat
047ad40b96
[Client] Clear FortifyAttribute effects when server sets modifier to 0
2017-12-02 09:22:36 +02:00
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.
2017-12-02 09:19:33 +02:00
David Cernat
ef6dc61797
[Client] Send PlayerAttribute packets when attribute modifiers change
2017-11-30 23:03:34 +02:00
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
2017-11-30 22:37:06 +02:00
David Cernat
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
2017-11-30 12:18:15 +02:00
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
scrawl
47a5229eed
Merge pull request #1564
2017-11-29 22:10:36 +00:00
scrawl
59bfd670c0
Merge pull request #1571
2017-11-29 22:04:41 +00:00
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
2017-11-29 03:52:15 +02:00
Grigorii Latyshev
2abb1a2ec2
Added checkMagicka parameter
2017-11-28 23:35:54 +01:00
Grigorii Latyshev
9fe5a4d236
Revert condition changes
2017-11-28 23:35:46 +01:00
Grigorii Latyshev
dab72b45db
Move mana reducing code back
2017-11-28 23:34:05 +01:00
Andrei Kortunov
b9d9660efd
Update music state in the menu mode (bug #3664 )
2017-11-28 20:49:48 +04:00
Andrei Kortunov
f7f8dfaf2a
AiWander: do not allow flying/swimming creatures to use pathgrid
2017-11-28 18:03:13 +04:00
scrawl
9920779a7b
Merge pull request #1543
2017-11-27 21:21:54 +00:00
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.
2017-11-27 21:20:31 +00:00
scrawl
5fe68ab062
Merge pull request #1419
2017-11-27 21:13:11 +00:00
scrawl
fee2e946d1
Merge pull request #1565
2017-11-27 21:13:09 +00:00
David Cernat
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
2017-11-27 07:39:02 +02:00
Kyle Cooley
eb23367175
Fix rendering depth/order issues
2017-11-26 17:39:57 -05:00
Grigorii Latyshev
ce32462358
Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*)
2017-11-26 13:58:04 +01:00
Andrei Kortunov
dea7d0beff
Do not interrupt swim and sneak idle animations during attack (bug #4122 )
2017-11-26 09:54:12 +04:00
Kyle Cooley
c8f79ea838
Adjust rotation markers
2017-11-25 20:46:14 -05:00
scrawl
88ec6179ff
Merge pull request #1566 from akortunov/guifixes
...
Set default values for class and birthsign select menus
2017-11-25 22:58:40 +00:00
David Cernat
300ca905fc
[Client] Don't pause game when minimizing window, despite MyGUI issues
2017-11-25 13:32:43 +02:00
Andrei Kortunov
55db3c2712
Set default values for class and birthsign select menus (bug #4226 )
2017-11-25 11:35:29 +04:00
David Cernat
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
2017-11-25 08:54:22 +02:00
Grigorii Latyshev
32096ae0cc
Fix displayed spell success chance in God Mode
2017-11-25 01:47:18 +01:00
scrawl
665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
...
Cyrillic journal index (bug #2485 )
2017-11-24 23:17:28 +00:00
scrawl
8226c8dc92
Merge pull request #1560 from akortunov/guifixes
...
Fix the Topics button position if the Tribunal is not installed
2017-11-24 23:16:33 +00:00
scrawl
f5c075b188
Merge pull request #1563 from drummyfish/throwfix
...
Make thrown projectiles rotate (#4216 )
2017-11-24 23:15:54 +00:00
Grigorii Latyshev
a7c953b318
Display 0 chance for spell if player does not have enought magic energy
2017-11-24 15:06:07 +01:00
David Cernat
2373be9735
Merge pull request #345 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-24 05:46:53 +02:00
Miloslav Číž
4373fea21e
Correct projectile rotation
2017-11-23 20:27:22 +01:00
Miloslav Číž
d0a299caab
Rotate thrown projectiles around the bb center
2017-11-23 20:02:38 +01:00
Miloslav Číž
38bda3bd71
Do not save thrown state for projectiles
2017-11-23 18:00:10 +01:00
Andrei Kortunov
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
2017-11-23 19:37:45 +04:00
Andrei Kortunov
a8bf4cdd98
Remove redundant include
2017-11-23 19:29:40 +04:00
Miloslav Číž
3dbcda6686
Make use of mEffectAnimationTime for projectile rotation
2017-11-23 15:14:15 +01:00
Miloslav Číž
2b9a0a7732
Save new projectile state
2017-11-23 12:11:26 +01:00
Andrei Kortunov
4f190bf7f4
Do not show carriage return characters (bug #3696 )
2017-11-23 14:58:20 +04:00
Andrei Kortunov
4d384889af
Fix the Topics button position if the Tribunal is not installed
2017-11-23 10:14:45 +04:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
2017-11-23 04:51:13 +02:00
Miloslav Číž
de42aa9d03
Make thrown projectiles rotate
2017-11-23 00:32:22 +01:00
David Cernat
6668b9ab42
[General] Implement ConsoleCommand packet
2017-11-23 00:21:47 +02:00
Andrei Kortunov
86a17b1e3e
Get rid of the redundant Utf8Stream when during journal index creation
2017-11-22 09:06:54 +04:00
Andrei Kortunov
3571f7f413
Remove getEncoding() from WindowManager
2017-11-22 08:32:38 +04:00
Andrei Kortunov
5f41f7c48d
Clean code up a bit
2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b
Convert topic name to Unicode
2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3
Merge from upstream master
2017-11-21 09:39:54 +04:00
