Commit Graph

21310 Commits (569243c987a5746b01008bdd8bb59780b8e31132)
 

Author SHA1 Message Date
David Cernat 569243c987 [Browser] Use better phrasing for disclaimer 7 years ago
Koncord 7180b009bd [Browser] Add disclaimer to the main window
Add forgotten default Browser section in the client config
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
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
Marc Zinnschlag 1daf8474a4 Merged pull request #896 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
David Cernat da66face25 [General] Rename GameTime packet into WorldTime 7 years ago
David Cernat 296c69d788
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
7 years ago
Bret Curtis 3fa3fc9d85
Merge pull request #1716 from declan-millar/soulgem_value_rebalance
Soul gem value rebalance
7 years ago
declan-millar 2963524a01 set rebalance soul gem values to true by default 7 years ago
declan-millar 7092dc4f40 Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance 7 years ago
Bret Curtis b4098b24b7
Merge pull request #1717 from akortunov/default_terrain
Render default land texture for Wilderness cells with distant terrain
7 years ago
Andrei Kortunov 888c2d9a33 Render default land texture for Wilderness cells with distant terrain 7 years ago
declan-millar b8df4b7c5a Tidy in-code comment 7 years ago
declan-millar 844aef85f3 Replace spelling: soulgem -> soul gem in code comment 7 years ago
declan-millar 9ed4f33048 Replace spelling: soulgem -> soul gem 7 years ago
declan-millar 028b528c0b Get soul magnitude before checking the rebalance setting 7 years ago
declan-millar 9346a552fa Use Rebalance soulgem values option to set soulgem value 7 years ago
declan-millar 0320f9a74d Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance 7 years ago
declan-millar 78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 7 years ago
David Cernat ad4214d3e2 Merge pull request #434 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw/mwmp/processors/worldstate/ProcessorGameTime.hpp
	components/CMakeLists.txt
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Worldstate/PacketGameTime.hpp
7 years ago
David Cernat 5af1150ab2 [General] Turn GameTime into a Worldstate packet 7 years ago
David Cernat e87e1dbb30 [General] Fix Worldstate packets by adding missing lines 7 years ago
David Cernat 815d17d9db
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
7 years ago
Bret Curtis 5775f420e2
Merge pull request #1714 from ananace/patch-9
Switch Appveyor CI to x64 VS2015 / 2017
7 years ago
David Cernat e690ff0e29
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
7 years ago
Alexander "Ananace" Olofsson d05de8e411
Give boost the correct toolset for 2017 7 years ago
Alexander "Ananace" Olofsson 4f758bdd48
Use different environments for 2015 and 2017 7 years ago
Alexander "Ananace" Olofsson 3bd8dc3ef6
Use the right boost version for Appveyor 7 years ago
Alexander "Ananace" Olofsson bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor 7 years ago
declan-millar 4b1247597e Use soulgem value rebalance formula from morrowind code patch 7 years ago
Alexander "Ananace" Olofsson e1e7a4b11a
Change Appveyor to use Visual Studio 2017 7 years ago
Alexander "Ananace" Olofsson 12b201348a
Switch to the supported VS versions on Appveyor 7 years ago
Alexander "Ananace" Olofsson ea6c73333b
Bumping Qt to 5.10 for Appveyor 7 years ago
Alexander "Ananace" Olofsson f8304a52c4
Enable verbose logging for CI 7 years ago