Commit Graph

15235 Commits (17a8e327829847b924c41cc0a002d542a9d15249)

Author SHA1 Message Date
David Cernat 17a8e32782 Merge pull request #314 from TES3MP/master
Add master commits up to 16 Oct 2017
7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 64d02f577e Fix missing null check 7 years ago
scrawl 624046c558 Fix unused event handler 7 years ago
scrawl bbf9b0c0a7 Merge pull request #1503 from akortunov/regressions
Handle Trespassing crime differently from Theft
7 years ago
scrawl 97ec38affb Merge pull request #1492 from drummyfish/master
fix rain/snow moving with player (issue #2698)
7 years ago
Andrei Kortunov 8f255a6b72 Handle Trespassing crime differently from Theft (bug #4158) 7 years ago
Miloslav Číž af6eeddbe5 use operator instead of drawcallback 7 years ago
Miloslav Číž 65977b910e wrap weather around in all directions 7 years ago
Miloslav Číž 380a5799dd use bbox as wrap range & apply to all particle systems 7 years ago
Miloslav Číž 38bfa64100 transform weather particles to world space 7 years ago
Miloslav Číž 8114126a62 make use of renderinfo 7 years ago
Miloslav Číž 33a1459b11 search for particle system by class name 7 years ago
Miloslav Číž b95c9ba483 rain independent from camera plus wrap-around 7 years ago
scrawl 548af6dbfb Fix jail screen fading 7 years ago
scrawl f3ca9832b0 Merge pull request #1500 from akortunov/extraspell
Implement ExtraSpell magic effect
7 years ago
Andrei Kortunov 30b05b557b ExtraSpell magic effect: a basic implementation 7 years ago
scrawl 09d7681254 Merge pull request #1499 from lukago/bug4155
Bugfix #4155: NPCs don't equip a second ring in some cases
7 years ago
glbwsk 83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 7 years ago
scrawl 548e90a7bc Set cursor active when moving by controller 7 years ago
glbwsk ff9cb22a58 npc swap cheaper ring during auto equip 7 years ago
glbwsk e6e482ea98 added some comments for autoEquip 7 years ago
glbwsk a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 7 years ago
Koncord 1fd16ba69c [Browser] Correctly init parent class 7 years ago
Koncord 62588ce088 [Server] Minor fixes 7 years ago
Koncord 3839a2dcfd [Browser] Remove unused variables 7 years ago
Koncord ed75563a94 [Browser] Do not show "Unreachable" servers when ping filter is enabled 7 years ago
Koncord 01a5196a92 [Browser] Mark few strings translatable 7 years ago
Koncord 15723adb9a [Browser] Make sort servers case insensitive 7 years ago
Koncord 57353cdfff [Browser] Mark unreachable servers as "Unreachable" instead 999 7 years ago
David Cernat fe9a3088bd Merge pull request #312 from TES3MP/master
Add master commits up to 10 Oct 2017
7 years ago
David Cernat ec2c964ae1 Merge pull request #311 from TES3MP/0.6.1
Add hotfix commit for 0.6.1 from 10 Oct 2017
7 years ago
David Cernat f532ab241d [Server] Avoid duplicates of the same player in a cell's loaders 7 years ago
David Cernat c35101cc36 [Client] Don't use message box call boolean for regular message boxes 7 years ago
David Cernat 4f112ba3d7 [Client] Use regular message boxes where expected to do so
This helps us move towards using the same terminology as OpenMW for GUI elements, leading to less confusion.
7 years ago
Koncord 5c79e7106f [Browser] Minor improvements 7 years ago
David Cernat 41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
scrawl 479f9535b4 Allow training window exit() 7 years ago
scrawl 9cde3e4408 Merge pull request #1495 from akortunov/regressions
Add showsInInventory() check to the ContainerItemModel
7 years ago
Andrei Kortunov ea3729790f Add showsInInventory() check to the ContainerItemModel 7 years ago
David Cernat 4845599bda Merge pull request #308 from TES3MP/master while resolving conflicts
# Conflicts:
#	apps/openmw-mp/main.cpp
7 years ago
David Cernat 182f8c1f06 [General] Print client version on startup 7 years ago
David Cernat 3d38da0e85 [Server] Put includes in a specific order 7 years ago
David Cernat 61b1a59814 [General] Move server's version printing method to Utils 7 years ago
David Cernat 08f34e5356 [Client] Fix recent problems with password window 7 years ago
David Cernat 711c4d83da [Client] Fix build after recent OpenMW changes to GUI 7 years ago
David Cernat 3e8d7c8416 Merge pull request #306 from OpenMW/master
Add OpenMW commits up to 7 Oct 2017
7 years ago
Kyle Cooley b14404e9cc Fix region colors 7 years ago
scrawl 7021d354c6 Merge pull request #1493 from akortunov/regressions
Regression fixes
7 years ago