5a852fe6db
[Client] Fix warnings related to declarations
4 years ago
cedf70f367
Add OpenMW commits up to 13 Apr 2021
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/summoning.cpp
# apps/openmw/mwphysics/mtphysics.hpp
4 years ago
ecde3932e2
Make AddItem's quantity overflow on negative numbers
4 years ago
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
0512a574e8
Fix remove item regression
4 years ago
bdcd2bc802
Allow adding levelled lists with AddItem
4 years ago
09373a757d
Merge branch 'radioactive' into 'master'
...
Container base record mutations
See merge request OpenMW/openmw!353
(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)
275908a0 mutate container base records
16fca11d add changelog entry
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
4560267298
[General] Track the client scripts that Object packets originate from
4 years ago
040a92c373
implement additem/removeitem for non-unique actors
5 years ago
038c5b8231
[Client] Rename ObjectList's addObject() into addBaseObject()
5 years ago
296c04af71
[Client] Combine ObjectList's getBaseObject() and getObjectFromPtr()
5 years ago
d2ba4a12d9
[Client] Simplify container sending with new addContainerItem() methods
5 years ago
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
e679190f31
Introduce a custom format() function to get rid of boost::format() and hackish replace()
6 years ago
62482657fc
GetWeaponType returns -2 for picks and -3 for probes (feature #5031 )
6 years ago
3872d7476b
Move makeOsgVec3f() to settingsutils.hpp
...
Remove all other makeOsgVec3f() implementations
6 years ago
8ecd0b82a4
Replace Boost format and replace_all where possible
6 years ago
3032b177a1
Remove redundant includes
6 years ago
0ab5314755
Make scripted items not stack (bug #2969 )
6 years ago
a8cf1e02c4
[Client] Allow unilateral scripted container changes not from console
...
This prevents infinite loops in certain client scripts from mods that use while loops to determine that all items of a certain type have been removed from a container, such as in the script BCSwap2Arg from Better_Clothes.
6 years ago
d9dd7073cf
[General] Send certain packets only when logged in
...
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.
To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
6 years ago
3bd8aa82fe
[General] Reduce inventory-sending hooks to just 2 in ContainerStore
...
Whenever an item is added to or removed from the player's ContainerStore, that player sends a PlayerInventory packet with just that addition or removal.
This eliminates all the unnecessary packet spam related to oversized PlayerInventory packets that had existed in one form or another since the initial implementation of inventory sync in 1b259e2d33
6 years ago
03832f933b
[Client] Send only individual items in PlayerInventory packets
...
For a long time, whenever a PlayerInventory packet was sent, it contained all the items in the player's inventory, because that's how Koncord originally implemented it and I always had too many other priorities to go back and rework it.
From now on, clients only send PlayerInventory packet with the one item added or removed, with the single exception being trading with merchants, where the entire inventory is still sent for the time being.
6 years ago
ce78a34010
Use container ID in Equip command warning
6 years ago
5a4d0cec3a
Use new logging system for game itself
6 years ago
d93b67ef21
[General] Sync soul refIds for items and add related script functions
7 years ago
36ac2d9de4
[Client] Set packetOrigin for all ObjectList packets sent
7 years ago
b891acd46e
[Client] Send Container packets when items are added/removed via scripts
...
Additionally, disable unilateral addition and removal of items on clients, and expect the server to reply back with an approved addition or removal.
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
c77c50e92b
Make Equip console command to bypass most of restrictions (bug #4460 )
7 years ago
73e7aa838d
Merge pull request #296 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
7 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
8 years ago
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
a82646a130
[Client] Delineate tes3mp-only code more clearly, part 2
8 years ago
11a9e3bdb1
Merge pull request #197 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
8 years ago
6e405aed8c
Adjustments to RemoveItem behavior
...
(Fixes #3796 )
8 years ago
a2ef39c655
Merge pull request #178 from OpenMW/master
...
Add OpenMW commits up to 2 Mar 2017
8 years ago
6c2ce2b2a1
Porting more ContainerStoreIterator usage to const version #4
...
removed const_cast revision
8 years ago
a58601fb2b
[Client] Delineate tes3mp-only code more clearly, part 1
8 years ago
9963601484
Porting code to ConstContainerStoreIterator #1
8 years ago
cdd796aba1
[Client] Send ID_PLAYER_INVENTORY from two more locations
8 years ago
03a35c38df
add missing item when executing the Equip instruction
8 years ago
ba3f4f122a
Account for the stack count in HasSoulGem (Bug #3340 )
9 years ago
David Cernat
Evil Eye
psi29a
Andrei Kortunov
Capostrophic
Grigory Latyshev
Capostrophic
Allofich
Rafael Moura
Marc Zinnschlag
scrawl