David Cernat
176aa62b15
Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Cells.cpp
apps/openmw-mp/Script/Functions/Cells.hpp
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp
apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp
components/openmw-mp/Base/BasePlayer.hpp
components/openmw-mp/Packets/Player/PacketPlayerMap.hpp
components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp
7 years ago
David Cernat
2942bf6455
Merge pull request #445 from OpenMW/master
...
Add OpenMW commits up to 6 Jun 2018
7 years ago
David Cernat
72862dc255
[General] Turn PlayerMap into WorldMap, now a Worldstate packet
7 years ago
Marc Zinnschlag
98063c5afc
updated changelog with last-minute crash-bug fix
7 years ago
David Cernat
6bb2a7e24a
Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts
7 years ago
David Cernat
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
0d0c4ac235
[Client] Use REPLY_TO_REQUEST container sub-action for partial requests
7 years ago
David Cernat
04a2025340
Fix crash when adding items to certain disabled creatures (bug #4441 )
7 years ago
David Cernat
83014d6381
[Client] Set actors as the owners of their items when editing containers
7 years ago
David Cernat
bacecc93e3
[Server] Make it possible to resend a received ObjectList of any kind
...
Additionally, make existing related functions less confusing.
7 years ago
David Cernat
494edbe5cb
[General] Add REPLY_TO_REQUEST container sub-action
7 years ago
David Cernat
c24157f6f9
[General] Fix CMakeLists in components for BaseObject
7 years ago
Marc Zinnschlag
7605d928db
added section for 0.45 to changelog
7 years ago
David Cernat
8ea9485e6b
[Client] Make container debug information more useful
7 years ago
David Cernat
058d67dbd0
[Server] Use consistent code style and make all files end in newlines
7 years ago
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
David Cernat
49bf605e8e
[Server] Create Worldstate class and implement associated table
7 years ago
Marc Zinnschlag
13f7b53b1c
Revert "Don't force DDS file usage ( fixes #1392 )"
...
This reverts commit 90f3ff2da4
.
7 years ago
Marc Zinnschlag
cd7268e9af
Merge remote-tracking branch 'akortunov/effectResistFix' into openmw-44
7 years ago
Marc Zinnschlag
2193983a69
updated changelog
7 years ago
David Cernat
07b781cd32
[Server] Fix variable name for actor table
7 years ago
Marc Zinnschlag
cae744161b
increased version number
7 years ago
Bret Curtis
896825e71d
Merge pull request #1729 from elsid/fix_utf8_encoding
...
Fix UTF-8 econding
7 years ago
elsid
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
7 years ago
Bret Curtis
4a2b973052
Merge pull request #1726 from elsid/fix_catch_warnings
...
Fix warnings: catching polymorphic type by value
7 years ago
Bret Curtis
2810a87956
Merge pull request #1727 from Capostrophic/refloading
...
Make weapon durability short unsigned (bug #4435 )
7 years ago
Capostrophic
eecde340cf
Make weapon health short unsigned ( fixes #4435 )
7 years ago
elsid
dba79f4d4d
Fix warnings: catching polymorphic type by value
...
openmw/apps/openmw/mwworld/worldimp.cpp: In member function ‘virtual bool MWWorld::World::findExteriorPosition(const string&, ESM::Position&)’:
openmw/apps/openmw/mwworld/worldimp.cpp:2650:25: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/apps/openmw/mwworld/worldimp.cpp:2654:25: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp: In member function ‘void Gui::NumericEditBox::onEditTextChange(MyGUI::EditBox*)’:
openmw/components/widgets/numericeditbox.cpp:41:21: warning: catching polymorphic type ‘class std::invalid_argument’ by value [-Wcatch-value=]
catch (std::invalid_argument)
^~~~~~~~~~~~~~~~
openmw/components/widgets/numericeditbox.cpp:45:21: warning: catching polymorphic type ‘class std::out_of_range’ by value [-Wcatch-value=]
catch (std::out_of_range)
^~~~~~~~~~~~
7 years ago
Andrei Kortunov
be394870e4
Fix regressions in spell resistance
7 years ago
Bret Curtis
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
...
AppVeyor: build with Release configuration
7 years ago
Stanislav Zhukov
08915c44a0
Merge pull request #431 from Aesylwinn/Travis-master
...
Fix travis build on master
7 years ago
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
7 years ago
Kyle Cooley
e12330b038
Undo increase to gcc/clang template depth
7 years ago
David Cernat
5c41350532
[Server] Fix function name for setting timeScale
7 years ago
David Cernat
fc4d3fe3fa
Merge pull request #441 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Worldstate.cpp
apps/openmw-mp/Script/Functions/Worldstate.hpp
7 years ago
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
David Cernat
3efe05a88e
[General] Implement WorldCollisionOverride packet
7 years ago
David Cernat
5d30a884ba
[Client] Add Worldstate to CMakeLists
7 years ago
David Cernat
e8ec031a81
[Client] Create Worldstate class that inherits BaseWorldstate
7 years ago
David Cernat
569243c987
[Browser] Use better phrasing for disclaimer
7 years ago
scrawl
dbb7277544
Merge pull request #1722
7 years ago
scrawl
31ea7c8edd
Revert "set rebalance soul gem values to true by default"
...
This reverts commit 2963524a01
.
7 years ago
Koncord
7180b009bd
[Browser] Add disclaimer to the main window
...
Add forgotten default Browser section in the client config
7 years ago
Capostrophic
7e38bb8513
Verifier: improve handling of class name and description
7 years ago
scrawl
cfdf99f601
Revert "Merged pull request #1573"
...
This reverts commit 7324bd368f
, reversing
changes made to 810e4416f6
.
7 years ago
scrawl
99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
...
This reverts commit da47fc79f5
, reversing
changes made to 7324bd368f
.
7 years ago
Marc Zinnschlag
b151a89528
Merged pull request #1568
7 years ago
Marc Zinnschlag
bbc337a0af
code cleanup
7 years ago
Marc Zinnschlag
e76df5f4d3
minor tooltip fixes
7 years ago
Marc Zinnschlag
e30ade81be
Merged pull request #1680
7 years ago