be542507f8
Make hasMaster() behavior consistent with isGameFile() ( fixes #3618 )
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
5f6ddcfc59
[General] Rework container sync to prevent item duping
...
A main priority in TES3MP development is to avoid making major changes to OpenMW code, so as to avoid merge conflicts in the future. Whenever avoiding potential conflicts seems especially difficult for the proper implementation of a particular multiplayer feature, that multiplayer feature is often put off until later or partially implemented with the intent of being revisited in the future.
Container sync is the perfect example. Previously, the OpenMW code for container actions was kept exactly as it was, with clients unilaterally accepting their own container changes as per singleplayer-specific code, with only the addition that clients sent container packets every time they made a change in a container, packets which were then forwarded unquestioningly by the server to other players. This meant that two players clicking on the same item in a container at the same time both managed to take it, thus duplicating the item.
Immediately after the packets were already forwarded, server scripts were able to check for incorrect changes, such as the removal of more items than should have existed in a container, but they had to send their own packets that attempted to fix what had already been accepted on the initial client and then forwarded to all clients, which was quite onerous in some scenarios, such as when a player on a slow connection immediately dropped items in the world after taking them from a container (which is why the default TES3MP serverside scripts made no attempt at sending corrective packets at all, preferring to expect the matter to be solved in a later C++ implementation).
This commit fixes item duping in containers by preventing container actions from initially running on clients and by ending the automatic forwarding of container packets by the server. Instead, clients now send container packets that act as requests for container actions, and serverside scripts have to forward these requests themselves. In other words, without a matching Container event in the server's Lua scripts, players are completely unable to affect containers for themselves or for others.
To forward a received Container packet, the following line must be used in a Container event in the Lua scripts:
tes3mp.SendContainer(true, true)
When an invalid action count is used in a container request, the serverside scripts can amend it using the following new function:
tes3mp.SetReceivedContainerItemActionCount(objectIndex, itemIndex, actionCount)
Thus, the serverside scripts are able to allow only container actions that are correct based on their own recorded contents for that container.
The OpenMW code allowing unilateral container actions in mwgui/container.cpp is now prevented from executing. When a player's container request is returned to them, code in mwmp/WorldEvent.cpp simulates those container actions instead.
7 years ago
eb723f5ae6
Merge pull request #1629
7 years ago
002ad9ae1b
Print a warning in case a fallback value wasn't found
7 years ago
e4531a6910
Use middle gray instead of pure black as default fallback color ( Fixes #2841 )
7 years ago
b249162ca1
[General] Implement setting of enforced client log level in GameSettings
...
Certain servers do not want the players to have debug information about the locations and actions of other players, so a client's log level can now be enforced by the server via the GameSettings packet.
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
db6107f12f
Merge branch 'master' into screenshot360
7 years ago
60f686ee43
[General] Implement setting of physics framerate as part of GameSettings
7 years ago
65c3472772
Merge pull request #386 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018, part 2
7 years ago
9b8c56761b
Fix timing error
7 years ago
145b47a550
Fix Windows builds
...
`std::min`/`std::max` are part of algorithm, which is not implicitly included in Windows builds
7 years ago
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
7 years ago
ac1609c433
Merge pull request #1604
7 years ago
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
7 years ago
5502790ed9
removed the unnecessary comment
7 years ago
86c25f5dba
Removed NIF flag handling to replicate vanilla engine behaviour
7 years ago
74765b3ace
[General] Implement selected spell sync as part of PlayerMiscellaneous
7 years ago
029dfc56ba
[General] Implement player scale as part of PlayerShapeshift
7 years ago
66078bfea7
[General] Implement Mark location sync as part of PlayerMiscellaneous
7 years ago
989f6e6b51
[General] Implement PlayerReputation packet
7 years ago
3d80e2db62
[General] Add placeholders for new packet types, part 2
7 years ago
273a1f50af
Merge pull request #377 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
02af7f6ba1
[General] Add placeholders for new packet types
7 years ago
25a6a67508
Fix the optimizer messing up LOD node's children ( Fixes #4301 )
7 years ago
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
89c6b59c30
Merge pull request #1602
7 years ago
420dab10e1
[General] Track objects directly placed by players in ObjectPlace
...
This allows the OnPCDrop variable to get set correctly even when object placements have to go through the server first in order to gain a unique multiplayer index (mpNum).
Among other things, this makes it possible to roll marijuana joints in the popular mod "Tribunal Code Patch".
7 years ago
613adf6b30
[General] Update version to 0.6.3
7 years ago
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
9e9f6f3132
loadtes3: don't pack() non-POD structs
7 years ago
359910762d
GraphicsWindowSDL2: support setting up GLESv2 context for android
7 years ago
a038327521
SDLCursorManager: fix possibly invalid read when no cursor present
...
On android we have no cursor so I moved the check closer to usage
7 years ago
28f47c4f81
[General] Update version to 0.6.2-hotfixed
7 years ago
9935f56d46
[General] Use doubles instead of ints for enchantmentCharge
...
Additionally, include enchantmentCharges for items in PlayerEquipment packets.
7 years ago
588c1df0f0
Merge pull request #1599 from xyzz/android
...
Update android port.
7 years ago
d2121ccd62
Update android port.
7 years ago
047c44f265
Ignore duplicate data directories to work around the fallout of ( Fixes #3557 )
7 years ago
259919d125
Print a warning when an ambiguous file on a case-sensitive file system is found
7 years ago
2dff3aab22
allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061
7 years ago
bba9a8dd91
Don't update off-screen animations
...
Make flying creatures animate in-place when out of processing range
7 years ago
a818140c14
Merge pull request #365 from OpenMW/master
...
Add OpenMW commits up to 2 Jan 2017
7 years ago
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
7 years ago
93f14c219c
camelCase
7 years ago
7a7b040216
fix building on mips machines
7 years ago
c920f95d1e
Don't incorrectly discard root node transformation ( Fixes #4272 )
7 years ago
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
993081ba1e
[General] Add enchantmentCharge to worldObjects and items
7 years ago
c9c363ebef
[General] Allow GameSettings to set bed & wilderness resting separately
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
3508a16836
[General] Use GameSettings packet to set ability to rest and wait
7 years ago
d06817a356
Merge pull request #347 from OpenMW/master
...
Add OpenMW commits up to 25 Nov 2017
7 years ago
94c0e3ed10
Move toUpper() from StringUtils to the JournalViewModel
7 years ago
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
7 years ago
6668b9ab42
[General] Implement ConsoleCommand packet
7 years ago
67acb83b62
Add missing include
7 years ago
5f41f7c48d
Clean code up a bit
7 years ago
ba91cd658b
Convert topic name to Unicode
7 years ago
f0ca3eabd3
Merge from upstream master
7 years ago
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
a391990f2a
Provide multibyte toLower() and single chars comparator
7 years ago
3ae5310567
use loading screen to freeze the screen
7 years ago
93e9df15c9
Fixed parameter naming
7 years ago
52b3507a2b
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
7 years ago
09aac22782
Added StringUtil::replaceAll()
7 years ago
92aaff3b78
Fixed escaping @ in boost program options filter
7 years ago
e804c4a011
remove no longer used method
7 years ago
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
7 years ago
a5ba1caed1
Merge pull request #1541 from astillich/4189
...
Fixed escaping @ in boost program options filter
7 years ago
a5adc5b018
Add NPC base skeleton files to the optimizer blacklist ( Fixes #4159 )
7 years ago
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
d763e9fe46
add settings for spherical screenshots
7 years ago
244cc5b861
Reduce error spam
7 years ago
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
43b5c2e36b
Fixed parameter naming
7 years ago
70d578d050
Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all
7 years ago
af3e1f92ec
Added StringUtil::replaceAll()
7 years ago
7d39c5450c
Fixed escaping @ in boost program options filter
7 years ago
2ca4017371
[Client] Force position updates for players in animations
7 years ago
be25decee2
[General] Implement PlayerSpeech packet
7 years ago
605b06c303
[General] Find actor speech captions instead of sending them in packets
7 years ago
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
7 years ago
413893aa51
[General] Implement PlayerAnimPlay packet
7 years ago
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
7 years ago
50d5fffb7f
[General] Add and implement PlayerQuickKeys packet
7 years ago
c1a871ff1f
Make indentation consistent.
7 years ago
daf7d8451c
Switch to a more reliable method of passing the git-version targt the data it needs
7 years ago
e3142b9643
Add missing variables to those forwarded to the git-version target
7 years ago
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
7 years ago
0c6ef17fb5
Add explicit variant of 'OnActivate'
7 years ago
8c47d63b08
[General] Update version to 0.6.2
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
46b015d3d9
Fix assert with empty setting value
...
Local value could be empty, so it's important to check it size before read first char.
7 years ago
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
7 years ago
184c5f2b29
Merge pull request #315 from OpenMW/master
...
Add OpenMW commits up to 17 Oct 2017
7 years ago
7f8d996eff
Merge pull request #1502 from AnyOldName3/launcher-and-wizard-ampersand-escape-support
...
Launcher and wizard ampersand escape support
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
136ef1f738
Fix incomplete settings in recreateShaders()
7 years ago
03554b2f4b
Fix some style issues flagged by cppcheck
7 years ago
50d7eb8e54
Fix crash when adding a NULL object to the cache
7 years ago
97ec38affb
Merge pull request #1492 from drummyfish/master
...
fix rain/snow moving with player (issue #2698 )
7 years ago
49dbb4a9ca
Add a third copy of a comment where I felt clarification was missing
7 years ago
7329e6a9ef
Load 'data=...' lines correctly when starting the wizard or launcher, and save them correctly when exiting the launcher.
7 years ago
28ff677337
Save 'data=...' lines correctly when exiting the wizard
7 years ago
65977b910e
wrap weather around in all directions
7 years ago
380a5799dd
use bbox as wrap range & apply to all particle systems
7 years ago
33a1459b11
search for particle system by class name
7 years ago
11eae16645
Get rid of duplicate function, fix flag checking
7 years ago
5fbdb64bb9
Add OPENMW_DECOMPRESS_TEXTURES environment variable to decompress textures in software if not supported by graphics hardware
...
Disabled by default due to requiring new functionality that was just added to OSG 3.6 or OpenMW/OSG.
7 years ago
f3ca9832b0
Merge pull request #1500 from akortunov/extraspell
...
Implement ExtraSpell magic effect
7 years ago
30b05b557b
ExtraSpell magic effect: a basic implementation
7 years ago
c9e86a8ebc
Remove superfluous argument
7 years ago
f9a3562ccd
Remove duplicate macro definition and fix warning
7 years ago
2652a89df4
Fix mismatched indentation that apparently the .editorconfig file doesn't handle automatically
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
182f8c1f06
[General] Print client version on startup
7 years ago
61b1a59814
[General] Move server's version printing method to Utils
7 years ago
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
7 years ago
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
44720bf41a
Allow MWList items to retain key focus
7 years ago
b9341925f2
Set AutoSizedEditBox as Static by default
...
Would look very odd anyway to use it for editable text, with the widget resizing as you type.
7 years ago
c88c535e0e
Fix HBox/VBox not using Client widget with MyGUI <= 3.2.2
7 years ago
ddf0dfed55
Merge pull request #298 from OpenMW/master
...
Add OpenMW commits up to 26 Sep 2017
7 years ago
be7bdec2ed
Merge pull request #1471 from crussell187/nif_stream_optimization
...
first pass on optimization of nif parsing functions from the file stream
7 years ago
19e07fad30
Remove redundant Services enum
7 years ago
82a211ba03
Fix duplicate code
7 years ago
76ddf8d794
Support Up/DownArrow keys to change NumericEditBox value
7 years ago
1ad14b232f
Adjust ImageButton to accept key focus and use the 'highlighted' texture
7 years ago
e7ad012977
Pass repeat key events to the GUI
...
For example, one can scroll to the last element in a list by holding down the 'Down Arrow' key.
7 years ago
2494c22d66
Merge pull request #1470 from MiroslavR/convertmprj
...
ESS-Importer: Convert magic projectiles
7 years ago
825de71b29
removed an iostream include used for debug prints from nifstream.hpp
7 years ago
30a213a9b3
updates for nifstream optimization including fixing the non-x86 path for little endian reads
7 years ago
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
8834066dea
make streaming to a type array in nif a direct copy from the file into the vector
7 years ago
090a8408b8
made nif basic type read optimizations more portable
7 years ago
c72aa19d6d
first pass on optimization of nif parsing functions from the file stream
7 years ago
58f9688433
Use client coordinates in HBox/VBox
7 years ago
fb975d02db
Use client coordinates in HBox/VBox
7 years ago
f15de6d3ca
ESS-Importer: Convert magic projectiles ( Closes #2320 )
7 years ago
7f0ea7d01f
Merge pull request #294 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
7 years ago
4d4eb1bb9f
Merge pull request #292 from OpenMW/master
...
Add OpenMW commits up to 18 Sep 2017
7 years ago
021627bdf8
Mark some functions with override
...
Fixes some Clang warnings about overriding a virtual function without the
override keyword.
7 years ago
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
7 years ago
4bb349a525
Use default 0 precision in the float formatting (bug #4096 )
7 years ago
2abf7f1752
Remove unnecessary cache dump
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
09e645a0e0
Fix careless mistake.
7 years ago
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
7 years ago
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
7 years ago
72cb405de2
Some bug fixes, changes to land load code.
7 years ago
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
7 years ago
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
7 years ago
538498230b
Declare mClient variable
7 years ago
dca31b7ffa
Remove redundant _boundingBoxComputed which no longer exists in osg master ( Fixes #4075 )
7 years ago
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
7 years ago
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
ccb15cc09e
[Client] When players die, make guards willing to arrest them again
7 years ago
7cc95a11a4
Add more land table columns
7 years ago
f5e23d5fc6
[General] Empty strings should be sent too
7 years ago
2e58024f1c
Fix intersections with Rig/MorphGeometry, was caused by an issue in the LineSegmentIntersector not respecting the cullingActive flag of a drawable.
7 years ago
d904628103
[General] Avoid limitation of 512 symbols in RakString Ctor
7 years ago
5e790b567e
Fix node path issue
...
Needs to be set so that the 'cullingActive' flag of the node path's end can be checked
7 years ago
4bef8260ab
Add const qualifiers
7 years ago
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
7 years ago
f1ebb129c1
Fix ShaderVisitor to deal with the fact RigGeometry no longer derives from Geometry
7 years ago
209e139aa8
Move double buffering implementation inside RigGeometry
...
The double buffering is an implementation detail so it should be handled as such, rather than mandating the scene graph to be structured in a certain way.
Override accept(NodeVisitor&) instead of using callbacks.
7 years ago
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
7 years ago
45f7563a55
Revert "Revert "Check for a Geometry node when attaching bodyparts""
...
Issue with shaders has been fixed with b9931fb71ca1e3fb7604
7 years ago
b9931fb71c
Set the shader on the node containing the StateSet
7 years ago
08df8f8d83
[General] Update version to 0.6.1
7 years ago
98a7769b91
Merge branch 'master' into 0.6.0
7 years ago
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
54f5104345
[General] Escape format for strings
7 years ago
cca4991e74
[Utils] Use consistent names for utility functions added by tes3mp
7 years ago
a1e3fb7604
Revert "Check for a Geometry node when attaching bodyparts"
...
This reverts commit 3fc8634206
7 years ago
3fc8634206
Check for a Geometry node when attaching bodyparts ( Fixes #3957 )
7 years ago
bc82c6a35d
Use white color if told to use nonexisting vertexcolors ( Fixes #3833 )
7 years ago
5d2fe5e887
Implement lightmode/vertmode of NiVertexColorProperty
7 years ago
4fba157d3b
Implement releaseGLObjects for cached resources
7 years ago
d3d04171f9
Fix seg fault, undo changes BsaArchive
7 years ago
8c4b12a603
VFS changes, one VFS and resource system per document.
...
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
7 years ago
979b0d7211
Code cleanup and more cache clearing
7 years ago
679a284735
Use scoped lock instead of directly locking/unlocking mutex
7 years ago
3b9326d238
Clear terrain cache and reload terrain
7 years ago
b62cb0e2a4
Clear out GPU texture/stateset cache
7 years ago
7914fd5c9c
Re-index BSAs
7 years ago
d7744e8b16
A bit of cleanup
7 years ago
5950b26912
Update scene assets
7 years ago
742bd00ec6
Clear cached resources
7 years ago
d31ed83b54
Preliminary asset reloading
7 years ago
54fe645703
Removing erroneous comment since Qt is not relevant here
7 years ago
464c64a306
Swap the OIS Ctrl and Meta keys on macOS to match Qt
7 years ago
cef415509f
Revert "Merge redundant input events"
8 years ago
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
0e2038f045
[General] Record and get player positions before their last cell change
8 years ago
Capostrophic
bret curtis
David Cernat
scrawl
Harald H
Miloslav Číž
Alexander "Ananace" Olofsson
uramer
Ilya Zhuravlev
Marc Zinnschlag
Andrei Kortunov
Alexander Stillich
David Walley
AnyOldName3
Marcin Baszczewski
AnyOldName3
Miloslav Číž
Kyle Cooley
MiroslavR
Chris Robinson
Koncord
Thunderforge