David Cernat
|
569243c987
|
[Browser] Use better phrasing for disclaimer
|
2018-05-27 15:27:50 +03:00 |
|
Koncord
|
7180b009bd
|
[Browser] Add disclaimer to the main window
Add forgotten default Browser section in the client config
|
2018-05-27 11:10:37 +08:00 |
|
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
|
2018-05-25 06:34:07 +03:00 |
|
David Cernat
|
49ea76aa9d
|
[General] Add notes for InputDialogs in GUIBoxes packet
|
2018-05-25 05:28:22 +03:00 |
|
David Cernat
|
3b5fb9cd6b
|
[General] Make it possible to set year via WorldTime
|
2018-05-25 03:33:12 +03:00 |
|
David Cernat
|
4acf93b7db
|
[General] Make it possible to set days passed via WorldTime
|
2018-05-24 14:02:04 +03:00 |
|
David Cernat
|
74c2a0b311
|
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
|
2018-05-24 12:16:11 +03:00 |
|
Marc Zinnschlag
|
1daf8474a4
|
Merged pull request #896
|
2018-05-24 09:50:22 +02:00 |
|
David Cernat
|
46744ee90f
|
[General] Make WorldTime script functions more consistent with others
|
2018-05-24 09:38:06 +03:00 |
|
Bret Curtis
|
da47fc79f5
|
Merge pull request #1701 from akortunov/standfix
Do not apply queue movement for standing actors
|
2018-05-23 22:35:08 +02:00 |
|
Marc Zinnschlag
|
7324bd368f
|
Merged pull request #1573
|
2018-05-23 17:00:29 +02:00 |
|
Marc Zinnschlag
|
810e4416f6
|
Merged pull request #1691
|
2018-05-23 16:56:36 +02:00 |
|
Marc Zinnschlag
|
d92d754834
|
Merged pull request #1697
|
2018-05-23 16:01:11 +02:00 |
|
Marc Zinnschlag
|
1564a3f6aa
|
Merged pull request #1713
|
2018-05-23 13:51:32 +02:00 |
|
Marc Zinnschlag
|
2f958881b7
|
Merged pull request #4413
|
2018-05-23 13:45:35 +02:00 |
|
David Cernat
|
8d36d0d945
|
[General] Make it possible to change world's time scale via WorldTime
|
2018-05-23 08:31:25 +03:00 |
|
David Cernat
|
f01c761cb1
|
[General] Use correct orderChannel for WorldTime packets
|
2018-05-23 07:51:18 +03:00 |
|
David Cernat
|
0be6de6607
|
[General] Turn RecordDynamic into a Worldstate packet
|
2018-05-23 07:48:28 +03:00 |
|
David Cernat
|
7083cb0359
|
Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts
|
2018-05-23 06:41:23 +03:00 |
|
David Cernat
|
031a80ed5a
|
[Client] Don't advance time when waiting, traveling, training or jailed
|
2018-05-23 05:49:51 +03:00 |
|
David Cernat
|
02ba641bef
|
[Server] Use correct index changes for dynamic stat script functions
|
2018-05-23 05:48:28 +03:00 |
|
David Cernat
|
da66face25
|
[General] Rename GameTime packet into WorldTime
|
2018-05-23 00:41:29 +03:00 |
|
David Cernat
|
296c69d788
|
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
|
2018-05-23 00:40:51 +03:00 |
|
Bret Curtis
|
3fa3fc9d85
|
Merge pull request #1716 from declan-millar/soulgem_value_rebalance
Soul gem value rebalance
|
2018-05-22 15:31:01 +02:00 |
|
declan-millar
|
2963524a01
|
set rebalance soul gem values to true by default
|
2018-05-22 12:59:27 +01:00 |
|
declan-millar
|
7092dc4f40
|
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
|
2018-05-22 12:46:06 +01:00 |
|
Bret Curtis
|
b4098b24b7
|
Merge pull request #1717 from akortunov/default_terrain
Render default land texture for Wilderness cells with distant terrain
|
2018-05-22 13:21:48 +02:00 |
|
Andrei Kortunov
|
888c2d9a33
|
Render default land texture for Wilderness cells with distant terrain
|
2018-05-22 12:40:01 +04:00 |
|
declan-millar
|
b8df4b7c5a
|
Tidy in-code comment
|
2018-05-21 22:14:23 +01:00 |
|
declan-millar
|
844aef85f3
|
Replace spelling: soulgem -> soul gem in code comment
|
2018-05-21 22:12:19 +01:00 |
|
declan-millar
|
9ed4f33048
|
Replace spelling: soulgem -> soul gem
|
2018-05-21 19:10:24 +01:00 |
|
declan-millar
|
028b528c0b
|
Get soul magnitude before checking the rebalance setting
|
2018-05-21 18:16:04 +01:00 |
|
declan-millar
|
9346a552fa
|
Use Rebalance soulgem values option to set soulgem value
|
2018-05-21 13:59:20 +01:00 |
|
declan-millar
|
0320f9a74d
|
Merge branch 'master' of https://github.com/OpenMW/openmw into soulgem_value_rebalance
|
2018-05-21 13:35:43 +01:00 |
|
declan-millar
|
78e79d5775
|
Add advanced option to Rebalance soulgem values to the launcher
|
2018-05-21 13:33:42 +01:00 |
|
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
|
2018-05-21 09:26:08 +03:00 |
|
David Cernat
|
5af1150ab2
|
[General] Turn GameTime into a Worldstate packet
|
2018-05-21 07:14:08 +03:00 |
|
David Cernat
|
e87e1dbb30
|
[General] Fix Worldstate packets by adding missing lines
|
2018-05-21 07:12:55 +03:00 |
|
David Cernat
|
815d17d9db
|
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
|
2018-05-21 02:07:08 +03:00 |
|
Bret Curtis
|
5775f420e2
|
Merge pull request #1714 from ananace/patch-9
Switch Appveyor CI to x64 VS2015 / 2017
|
2018-05-21 00:03:07 +02:00 |
|
David Cernat
|
e690ff0e29
|
Merge pull request #432 from OpenMW/master
Add OpenMW commits up to 18 May 2018
|
2018-05-20 23:48:53 +03:00 |
|
Alexander "Ananace" Olofsson
|
d05de8e411
|
Give boost the correct toolset for 2017
|
2018-05-20 18:51:28 +02:00 |
|
Alexander "Ananace" Olofsson
|
4f758bdd48
|
Use different environments for 2015 and 2017
|
2018-05-20 18:24:06 +02:00 |
|
Alexander "Ananace" Olofsson
|
3bd8dc3ef6
|
Use the right boost version for Appveyor
|
2018-05-20 18:22:02 +02:00 |
|
Alexander "Ananace" Olofsson
|
bcfa2a13a6
|
Use the VS2017 packaging of Qt5 for Appveyor
|
2018-05-20 18:09:31 +02:00 |
|
declan-millar
|
4b1247597e
|
Use soulgem value rebalance formula from morrowind code patch
|
2018-05-20 17:06:26 +01:00 |
|
Alexander "Ananace" Olofsson
|
e1e7a4b11a
|
Change Appveyor to use Visual Studio 2017
|
2018-05-20 18:04:59 +02:00 |
|
Alexander "Ananace" Olofsson
|
12b201348a
|
Switch to the supported VS versions on Appveyor
|
2018-05-20 17:17:04 +02:00 |
|
Alexander "Ananace" Olofsson
|
ea6c73333b
|
Bumping Qt to 5.10 for Appveyor
|
2018-05-20 17:14:32 +02:00 |
|
Alexander "Ananace" Olofsson
|
f8304a52c4
|
Enable verbose logging for CI
|
2018-05-20 17:04:52 +02:00 |
|