Commit Graph

21369 Commits (fc4d3fe3fad256026a4a8f1e7ff712b0b0c37a7e)
 

Author SHA1 Message Date
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
David Cernat f7a084c824 [Client] Use faster check for whether actors are DedicatedPlayers 7 years ago
David Cernat c8ec77875c [Client] Update old comments for changes made by tes3mp 7 years ago
Bret Curtis 13391e833d
Merge pull request #1718 from akortunov/appveyor
Preserve AppVeyor artifacts
7 years ago
Andrei Kortunov 48e15dabc3 Try to generate PDB for release builds 7 years ago
Marc Zinnschlag 832b4bb778 Merged pull request #1659 7 years ago
Bret Curtis 42ef4ed843
Merge pull request #1719 from nikolaykasyanov/deduplicate-nightlies
[macOS, CI] Do not upload a nightly if there's already one of the same commit
7 years ago
David Cernat 416ee77639 [General] Add placeholder for WorldCollisionOverride packet 7 years ago
David Cernat 2edb511a0b [Client] Remove unnecessary condition from WorldTime processor 7 years ago
David Cernat 3f7e163c92 Merge pull request #439 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
	components/CMakeLists.txt
	components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
7 years ago
David Cernat 49ea76aa9d [General] Add notes for InputDialogs in GUIBoxes packet 7 years ago
David Cernat 3b5fb9cd6b [General] Make it possible to set year via WorldTime 7 years ago
Nikolay Kasyanov ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 7 years ago
Andrei Kortunov 77c5e85e8d Enable release builds 7 years ago
Andrei Kortunov 8c95676352 Preserve AppVeyor builds 7 years ago
David Cernat 4acf93b7db [General] Make it possible to set days passed via WorldTime 7 years ago
David Cernat 74c2a0b311
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
7 years ago
Andrei Kortunov 1abff5365b Capitalize enchanted items names again in spells window 7 years ago
Andrei Kortunov afae398b5c Use utf8 lowercase function for journal index to avoid code duplication 7 years ago
Andrei Kortunov b5374029e5 Implement case-insensitive search in spell window 7 years ago
Marc Zinnschlag 1daf8474a4 Merged pull request #896 7 years ago
Andrei Kortunov 9ac752ea70 Implement filtering in the spells window 7 years ago
David Cernat 46744ee90f [General] Make WorldTime script functions more consistent with others 7 years ago
Bret Curtis da47fc79f5
Merge pull request #1701 from akortunov/standfix
Do not apply queue movement for standing actors
7 years ago
Marc Zinnschlag 7324bd368f Merged pull request #1573 7 years ago
Marc Zinnschlag 810e4416f6 Merged pull request #1691 7 years ago
Marc Zinnschlag d92d754834 Merged pull request #1697 7 years ago
Marc Zinnschlag 1564a3f6aa Merged pull request #1713 7 years ago
Marc Zinnschlag 2f958881b7 Merged pull request #4413 7 years ago
David Cernat 8d36d0d945 [General] Make it possible to change world's time scale via WorldTime 7 years ago
David Cernat f01c761cb1 [General] Use correct orderChannel for WorldTime packets 7 years ago
David Cernat 0be6de6607 [General] Turn RecordDynamic into a Worldstate packet 7 years ago
David Cernat 7083cb0359 Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts 7 years ago
David Cernat 031a80ed5a [Client] Don't advance time when waiting, traveling, training or jailed 7 years ago
David Cernat 02ba641bef [Server] Use correct index changes for dynamic stat script functions 7 years ago