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
|
2017-10-16 07:37:29 +03:00 |
|
scrawl
|
03554b2f4b
|
Fix some style issues flagged by cppcheck
|
2017-10-15 17:06:58 +02:00 |
|
scrawl
|
64d02f577e
|
Fix missing null check
|
2017-10-15 17:06:58 +02:00 |
|
scrawl
|
624046c558
|
Fix unused event handler
|
2017-10-15 17:06:58 +02:00 |
|
scrawl
|
bbf9b0c0a7
|
Merge pull request #1503 from akortunov/regressions
Handle Trespassing crime differently from Theft
|
2017-10-15 09:08:52 +00:00 |
|
scrawl
|
97ec38affb
|
Merge pull request #1492 from drummyfish/master
fix rain/snow moving with player (issue #2698)
|
2017-10-15 09:04:48 +00:00 |
|
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 |
|
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 |
|
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 |
|
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
|
182f8c1f06
|
[General] Print client version on startup
|
2017-10-08 06:17:53 +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 |
|
scrawl
|
7021d354c6
|
Merge pull request #1493 from akortunov/regressions
Regression fixes
|
2017-10-06 16:21:16 +00: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 |
|