mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-25 17:09:40 +00:00
Code Issues Releases Wiki Activity
20346 commits 38 branches 54 tags 122 MiB
Commit graph

15282 commits

Author SHA1 Message Date
Andrei Kortunov
8f255a6b72 Handle Trespassing crime differently from Theft (bug #4158) 2017-10-15 11:03:02 +04:00
Miloslav Číž
af6eeddbe5 use operator instead of drawcallback 2017-10-15 00:04:14 +02:00
Miloslav Číž
65977b910e wrap weather around in all directions 2017-10-14 21:42:27 +02:00
Miloslav Číž
380a5799dd use bbox as wrap range & apply to all particle systems 2017-10-14 21:42:19 +02:00
Miloslav Číž
38bfa64100 transform weather particles to world space 2017-10-14 21:42:11 +02:00
Miloslav Číž
8114126a62 make use of renderinfo 2017-10-14 21:41:59 +02:00
Miloslav Číž
33a1459b11 search for particle system by class name 2017-10-14 21:41:47 +02:00
Miloslav Číž
b95c9ba483 rain independent from camera plus wrap-around 2017-10-14 21:40:28 +02:00
Kyle Cooley
11eae16645 Get rid of duplicate function, fix flag checking 2017-10-14 15:09:12 -04:00
Kyle Cooley
d27071f06a Fix LTEX import bug. 2017-10-14 13:18:54 -04:00
Kyle Cooley
98c38ad7d1 Merge cleanup. 2017-10-14 13:18:31 -04:00
Kyle Cooley
6d9d98c02c Merge Land/LandTextures 2017-10-14 11:32:42 -04:00
scrawl
548af6dbfb Fix jail screen fading 2017-10-14 14:03:16 +00:00
scrawl
f3ca9832b0 Merge pull request #1500 from akortunov/extraspell 
Implement ExtraSpell magic effect
 2017-10-14 14:01:49 +00:00
Andrei Kortunov
30b05b557b ExtraSpell magic effect: a basic implementation 2017-10-14 16:55:00 +04:00
scrawl
09d7681254 Merge pull request #1499 from lukago/bug4155 
Bugfix #4155: NPCs don't equip a second ring in some cases
 2017-10-13 19:35:03 +00:00
glbwsk
83a5c7c3d8 removed unnecessary comments, added gitignore for clion cmake 2017-10-13 20:32:52 +02:00
scrawl
548e90a7bc Set cursor active when moving by controller 2017-10-13 16:22:44 +00:00
glbwsk
ff9cb22a58 npc swap cheaper ring during auto equip 2017-10-13 15:16:07 +02:00
glbwsk
e6e482ea98 added some comments for autoEquip 2017-10-13 14:47:26 +02:00
glbwsk
a25903b075 fixed autoequiping rings by npc - now checks if right hand is free 2017-10-13 14:39:44 +02:00
Koncord
1fd16ba69c [Browser] Correctly init parent class 2017-10-11 06:35:22 +08:00
Koncord
62588ce088 [Server] Minor fixes 2017-10-11 06:26:09 +08:00
Koncord
3839a2dcfd [Browser] Remove unused variables 2017-10-11 05:46:39 +08:00
Koncord
ed75563a94 [Browser] Do not show "Unreachable" servers when ping filter is enabled 2017-10-11 05:36:31 +08:00
Koncord
01a5196a92 [Browser] Mark few strings translatable 2017-10-10 13:11:36 +08:00
Koncord
15723adb9a [Browser] Make sort servers case insensitive 2017-10-10 13:11:36 +08:00
Koncord
57353cdfff [Browser] Mark unreachable servers as "Unreachable" instead 999 2017-10-10 13:11:36 +08:00
David Cernat
fe9a3088bd Merge pull request #312 from TES3MP/master 
Add master commits up to 10 Oct 2017
 2017-10-10 06:27:35 +03:00
David Cernat
ec2c964ae1 Merge pull request #311 from TES3MP/0.6.1 
Add hotfix commit for 0.6.1 from 10 Oct 2017
 2017-10-10 06:26:33 +03:00
David Cernat
f532ab241d [Server] Avoid duplicates of the same player in a cell's loaders 2017-10-10 05:48:56 +03:00
David Cernat
c35101cc36 [Client] Don't use message box call boolean for regular message boxes 2017-10-10 04:11:36 +03:00
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.
 2017-10-10 04:05:36 +03:00
Koncord
5c79e7106f [Browser] Minor improvements 2017-10-10 07:17:41 +08:00
David Cernat
41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-10-09 14:41:55 +03:00
scrawl
479f9535b4 Allow training window exit() 2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408 Merge pull request #1495 from akortunov/regressions 
Add showsInInventory() check to the ContainerItemModel
 2017-10-08 14:09:59 +00:00
Andrei Kortunov
ea3729790f Add showsInInventory() check to the ContainerItemModel 2017-10-08 09:20:07 +04:00
David Cernat
4845599bda Merge pull request #308 from TES3MP/master while resolving conflicts 
# Conflicts:
#	apps/openmw-mp/main.cpp
 2017-10-08 06:50:15 +03:00
David Cernat
182f8c1f06 [General] Print client version on startup 2017-10-08 06:17:53 +03:00
David Cernat
3d38da0e85 [Server] Put includes in a specific order 2017-10-08 05:17:14 +03:00
David Cernat
61b1a59814 [General] Move server's version printing method to Utils 2017-10-08 04:16:30 +03:00
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03:00
David Cernat
711c4d83da [Client] Fix build after recent OpenMW changes to GUI 2017-10-07 23:33:36 +03:00
David Cernat
3e8d7c8416 Merge pull request #306 from OpenMW/master 
Add OpenMW commits up to 7 Oct 2017
 2017-10-07 21:54:21 +03:00
Kyle Cooley
b14404e9cc Fix region colors 2017-10-06 20:05:06 -04:00
scrawl
7021d354c6 Merge pull request #1493 from akortunov/regressions 
Regression fixes
 2017-10-06 16:21:16 +00:00
David Cernat
7a38a0b223 Merge pull request #305 from TES3MP/master 
Add master commits up to 6 Oct 2017
 2017-10-06 19:19:49 +03:00
scrawl
2805781542 Fix a crash when exit() already hides the window (Fixes #4148) 2017-10-06 16:18:57 +00:00
Andrei Kortunov
ad27e0f945 Fix owned tooltip in the spellwindow 2017-10-06 11:38:27 +04:00
Andrei Kortunov
e2afd3690c Remove item by id from InventoryStore 2017-10-06 10:54:25 +04:00
David Cernat
38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 2017-10-06 04:10:04 +03:00
scrawl
842a42ee66 Fix non-top level Windows accepting key focus 2017-10-05 18:41:02 +02:00
scrawl
8c0790580a Add screen fading for exterior cell transitions 2017-10-05 18:41:02 +02:00
scrawl
cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 2017-10-05 18:35:09 +02:00
scrawl
d94235e3a7 Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard 2017-10-04 16:00:39 +00:00
scrawl
12510efab7 Fade screen out during loading screen (when travelling) 2017-10-04 16:00:38 +00:00
scrawl
a4737d8417 Use MyGUI frame events for ScreenFader 2017-10-04 16:00:38 +00:00
scrawl
e4f0f7157a Fix pinned windows not being updated 2017-10-04 16:00:37 +00:00
scrawl
49a0922f1b Remove 'visibility mask' gui feature which did not end up being useful 2017-10-04 16:00:37 +00:00
scrawl
7c68ed04b2 Don't require modal windows to be removed in the same order they were added 2017-10-04 16:00:37 +00:00
scrawl
b5c9977a7b Merge pull request #1489 from akortunov/guifixes 
Use an "owned crosshair" feature for items in containers
 2017-10-04 15:59:43 +00:00
Andrei Kortunov
1cb7ed5db1 Use owned tooltips for items in containers correctly 2017-10-04 12:13:45 +04:00
scrawl
433028e8d7 Fix GUI regressions 2017-10-03 22:07:56 +00:00
Marc Zinnschlag
dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
Kyle Cooley
2f5449a68c Remove now unnecessary overrides. 2017-10-02 16:13:40 -04:00
Kyle Cooley
137ea872d3 Hide base land textures. 2017-10-02 15:56:22 -04:00
Koncord
cbabc91b06 [Server] Stop MasterClient thread and inform server owner on ban 2017-10-03 03:17:25 +08:00
Koncord
846f83e3e4 [Master] Use RakNet ban system instead homebrew 2017-10-03 03:17:25 +08:00
scrawl
b24fd77ea2 Merge pull request #1488 from akortunov/equipfix 
AI: Autoequip armor when bound armor spell expires
 2017-10-01 16:06:26 +00:00
scrawl
302e3c8b3d Merge pull request #1486 from akortunov/pickpocketfix 
Fix some issues with pickpocketing (bug #4131)
 2017-10-01 16:05:38 +00:00
Andrei Kortunov
21b6bd176f AI: Autoequip armor when bound armor spell expires 2017-10-01 17:11:30 +04:00
Andrei Kortunov
c5fcb9684e Improve owned crosshair feature behaviour 2017-09-30 21:29:02 +04:00
Andrei Kortunov
b8fd530ee1 Do not speak with unconscious creatures 2017-09-30 21:20:38 +04:00
Andrei Kortunov
f26206b630 Make unconscious actors do not speak and do not track targets 2017-09-30 20:55:42 +04:00
Andrei Kortunov
3ebb18ce18 Make unconscious actors do not report about crimes 2017-09-30 20:35:29 +04:00
Andrei Kortunov
34895157f9 Consider taking items from unconscious NPC as a theft 2017-09-30 20:22:26 +04:00
Andrei Kortunov
04452b0949 Use a pickpocket crime instead of theft when pickpocketing was failed 2017-09-30 20:11:53 +04:00
scrawl
3c62a8c5c2 Fix console selected object persisting on a new game 2017-09-30 15:40:47 +00:00
scrawl
097b9d90bc Fix travel service not showing 2017-09-30 15:40:47 +00:00
Kyle Cooley
dfcbee3ab1 Ignore case when comparing textures, also add new textures to lookup map. 2017-09-30 00:04:52 -04:00
scrawl
77ddaa869b Merge pull request #1484 from drummyfish/master 
fix rain ripple bug
 2017-09-29 22:53:48 +00:00
Andrei Kortunov
03daf2b9e3 Fix a failed assert in the getCell() check during a new game start 2017-09-29 22:28:09 +04:00
Miloslav Číž
4999c667b6 fix rain ripple bug 2017-09-29 19:56:16 +02:00
scrawl
5b10e3128e Use first resolution in fullscreen if current is not supported (Fixes #4113) 2017-09-29 14:58:25 +00:00
scrawl
64e27c032b Merge pull request #1481 from scrawl/keyfocus 
WindowManager overhaul & improved keyboard support
 2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed Merge pull request #1483 from drummyfish/master 
water shader improvements plus rain ripple effect (#452)
 2017-09-28 22:31:13 +00:00
scrawl
7bb0a76df2 Fix tooltips showing when cursor isn't visible 2017-09-28 19:42:16 +02:00
Miloslav Číž
8416feaf5b link rain water ripple effect to actual rain 2017-09-28 19:04:31 +02:00
scrawl
14c9e858c8 Check to make sure button is enabled 2017-09-28 17:00:07 +00:00
scrawl
6ec66fa95f Restore keyfocus to goodbye when selecting a topic 2017-09-28 16:57:55 +00:00
David Cernat
841a4f90c1 Merge pull request #301 from TES3MP/master 
Add master commits up to 28 Sep 2017
 2017-09-28 11:13:51 +03:00
David Cernat
44fb7518ee Merge pull request #300 from OpenMW/master 
Add OpenMW commits up to 28 Sep 2017
 2017-09-28 11:09:14 +03:00
scrawl
e5d1fd022f Merge pull request #1479 from akortunov/physics 
Make physics framerate configurable
 2017-09-27 22:31:00 +00:00
scrawl
0ae009eb21 Hide message box before deleting it 
Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
 2017-09-27 22:19:42 +02:00
scrawl
d53e7f8a3c Remove redundant code 
Already worked around in WindowBase::setVisible
 2017-09-27 22:07:49 +02:00
scrawl
0deda69a27 Fix wrong skin for levelup attribute values 2017-09-27 22:04:36 +02:00
scrawl
e9d81fdf5a Fix being able to escape interactive messageboxes 2017-09-27 22:00:20 +02:00
scrawl
db650df416 Fix 'blocking' messageboxes not handling key focus properly 2017-09-27 21:41:22 +02:00
scrawl
a0f5e32113 Fix 'new game' from the main menu not removing menu afterwards 2017-09-27 21:38:15 +02:00