Commit Graph

1373 Commits (cf3369544756eed1ce590218c1a2de3c74917564)

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 569243c987 [Browser] Use better phrasing for disclaimer 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
Marc Zinnschlag b151a89528 Merged pull request #1568 7 years ago
Marc Zinnschlag e30ade81be Merged pull request #1680 7 years ago
Andrei Kortunov 9ac752ea70 Implement filtering in the spells window 7 years ago
David Cernat 7083cb0359 Merge pull request #437 from TES3MP/0.6.3 while resolving conflicts 7 years ago
David Cernat 296c69d788
Merge pull request #436 from OpenMW/master
Add OpenMW commits up to 22 May 2018
7 years ago
declan-millar 2963524a01 set rebalance soul gem values to true by default 7 years ago
declan-millar 9ed4f33048 Replace spelling: soulgem -> soul gem 7 years ago
declan-millar 78e79d5775 Add advanced option to Rebalance soulgem values to the launcher 7 years ago
David Cernat 7c8dd7380f Merge pull request #421 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Actors.cpp
	apps/openmw-mp/Script/Functions/Actors.hpp
	apps/openmw-mp/Script/Functions/Cells.cpp
7 years ago
David Cernat 5458e09c8a
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
7 years ago
Nelsson Huotari 4ae75d1d20 Terrain texture brush frame 7 years ago
Marc Zinnschlag e661e3cf74 Merged pull request #1677 7 years ago
Nelsson Huotari a2745683e6 new run icon 7 years ago
Nelsson Huotari e4e225f4e7 Add topic, journal and related -info icons. 7 years ago
David Cernat 502751cae0 Merge pull request #413 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/processors/player/ProcessorPlayerCellChange.hpp
	components/openmw-mp/Base/BasePlayer.hpp
	components/openmw-mp/Packets/Player/PacketPlayerEquipment.hpp
	components/openmw-mp/Packets/Player/PacketPlayerSkill.cpp
7 years ago
David Cernat 7db74509e0 Merge pull request #412 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwscript/transformationextensions.cpp
7 years ago
Alexander Olofsson f0288282be Slight appdata cleanup and improvement 7 years ago
David Cernat e355dca4dd Merge pull request #409 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/Items.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
7 years ago
David Cernat 17678ee60f
Merge pull request #407 from OpenMW/master
Add OpenMW commits up to 17 Apr 2018
7 years ago
Nelsson Huotari af558e07a3 implement +6 icons 7 years ago
Nelsson Huotari 69aacdff17 Lamoot's new icon set 7 years ago
scrawl fc72483ddf
Merge pull request #1673 7 years ago
Capostrophic b08d7b4a3b Use centroid interpolation for shader lighting (fixes #4143) 7 years ago
David Cernat 2390744b45 Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Player.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Settings.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	components/openmw-mp/Base/BasePlayer.hpp
7 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
7 years ago
scrawl 0982d2175a
Merge pull request #1473 7 years ago
scrawl 35300c04cd
Merge pull request #1671 7 years ago
Capostrophic cddc0914c8 Option to charge for all companions travelling (fixes #4064) 7 years ago
David Cernat f50637bdd4 Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts
# Conflicts:
#	apps/openmw-mp/processors/world/ProcessorContainer.hpp
#	apps/openmw/mwmp/WorldEvent.cpp
7 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
scrawl c610b8acc8
Merge pull request #1649 7 years ago
scrawl 80a8ef6d49
Merge pull request #1661 7 years ago
Koncord 6131ada0ba [Browser] Add compatibility compilation mode 7 years ago
David Cernat 5bb09d3bed Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwmp/WorldEvent.hpp
	apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
7 years ago
Koncord 2aaf9105af [Browser] Add Client Settings and Server Settings Tabs.
Save Browser state to the client config
7 years ago
Capostrophic baaf65bc2c Add vanilla enchanted weaponry behavior option, on by default (fixes #4136) 7 years ago
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
7 years ago
bret curtis 4890ecd357 remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 7 years ago
Capostrophic 2d119e834a Add vanilla absorb attribute behavior option, on by default (Fixes #4135) 7 years ago
David Cernat 7ec08e125b Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/Script/Functions/Settings.cpp
	apps/openmw-mp/Script/Functions/Settings.hpp
7 years ago
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
scrawl e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333) 7 years ago
Harald H d3b623b5d3 http to https for supported urls (#1625)
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
7 years ago
Chris Robinson 01dbac7b15 Don't use a different setting for distant viewing distance 7 years ago
Chris Robinson 41669467ae Make settings for distant fog parameters 7 years ago