Bret Curtis
a55583a395
Merge branch 'master' into master
2018-06-21 22:22:01 +02:00
Xenkhan
405a0caf29
Remove unneeded whitespace
2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<>
2018-06-20 13:33:59 -05:00
Marc Zinnschlag
22eb037c18
Merged pull request #1773
2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression
...
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
2018-06-20 17:19:48 +02:00
Marc Zinnschlag
6315848620
Merged merge request !2
2018-06-20 16:02:54 +02:00
Bret Curtis
b619c0de2d
Merge pull request #1772 from akortunov/deathanim
...
Fast-forward death animation to end if death animation was finished earlier
2018-06-20 13:28:36 +02:00
Andrei Kortunov
c195144b17
Take transformation from first node with given name in file (bug #4469 )
2018-06-20 14:24:32 +04:00
Atahualpa
c0fc615cd6
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Improves previous commit:
1. Initialise mIgnoreBase boolean member with FALSE.
2. Remove isBaseOnly() function and replace with direct use of Record member.
2018-06-20 11:29:38 +02:00
Bret Curtis
664edc5a39
Merge pull request #1757 from akortunov/musicfix
...
Handle exception when try to load non-music file
2018-06-20 11:18:50 +02:00
Andrei Kortunov
c9756cee4c
Fast-forward death animation to end if death animation was finished earlier (regression #4468 )
2018-06-20 12:37:58 +04:00
Atahualpa
9d61d76e92
Adds the option to ignore "Base" records when running the verifier. ( fixes #4466 )
...
Adds a boolean setting to the user preferences. This setting is locally saved to all OpenMW-CS check stages. When a verification is done, the setting is updated on setup for each check stage. If set to true, the boolean value is then used to skip the verification process for every base record - minus some special cases where, e.g., counters are to be set first.
Related issue:
- Fixes #4466 : Editor: Add option to ignore base records when running verifier (https://gitlab.com/OpenMW/openmw/issues/4466 )
Tests:
The changes were successfully tested in OpenMW-CS by creating faulty "Base" and "Modified" records for every record type (if possible) and, then, running the verifier with and without the option respectively.
2018-06-20 00:20:03 +02:00
Xenkhan
24ddb66af9
Retrieve SDL window settings instead of using magic numbers
2018-06-19 15:03:30 -05:00
Capostrophic
6c23caadd7
Fix crash when a target in a different cell is (un)locked
2018-06-19 20:43:18 +03:00
Capostrophic
0c4fa55f16
Make Open spells casted by anything trigger player crime event ( fixes #4461 )
2018-06-19 17:04:38 +03:00
Marc Zinnschlag
7cfb7063c2
Merged pull request #1767
2018-06-19 13:30:10 +02:00
Marc Zinnschlag
7be069fcd2
Merged pull request #1743
2018-06-19 13:29:20 +02:00
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
2018-06-19 14:17:33 +04:00
Marc Zinnschlag
a8ad530db9
Merged pull request #1749
2018-06-19 11:33:08 +02:00
Marc Zinnschlag
2a52ade219
Merged pull request #1760
2018-06-19 11:26:41 +02:00
Capostrophic
8376c8c68e
Allow partial matches in NotCell condition ( fixes #4459 )
2018-06-18 03:27:31 +03:00
Bret Curtis
e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
...
Remove screenshot taken message again
2018-06-17 22:26:00 +02:00
Bret Curtis
70dec71c00
Merge pull request #1763 from akortunov/activatedoor
...
Forbid actors to use teleporting doors
2018-06-17 10:13:16 +02:00
Bret Curtis
3cc6da1db2
Update door.cpp
...
typo fix
2018-06-17 10:13:03 +02:00
Bret Curtis
3f2dbdc8a8
Merge branch 'master' into wanderfix
2018-06-17 10:00:38 +02:00
Bret Curtis
ecfc5fcd63
Merge pull request #1764 from akortunov/lightfix
...
Ignore lights without CanCarry flags when NPC selects torch
2018-06-17 08:40:50 +02:00
Andrei Kortunov
f3f7487664
Fix arguments parsing for AiWander console command (bug #4458 )
2018-06-16 22:11:10 +04:00
Andrei Kortunov
e08b0d3070
Ignore lights without CanCarry flags when NPC selects torch (bug #4457 )
2018-06-16 17:34:49 +04:00
Andrei Kortunov
2a65aaf5ab
Forbid actors to use teleporting doors (bug #2562 )
2018-06-16 14:21:28 +04:00
Nikolay Kasyanov
359f87ab9f
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
2018-06-16 12:12:32 +02:00
Bret Curtis
3f88aa46d0
Merge pull request #1759 from Thunderforge/refactor-launcher-sdl
...
Refactor SDL loading in Launcher to fix macOS errors
2018-06-15 12:58:44 +02:00
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
2018-06-15 14:31:09 +04:00
Thunderforge
506d615acc
Moving csignal import from main to graphicspage
2018-06-14 22:16:35 -05:00
Thunderforge
7615e78e52
Move SDL initialization from main.cpp to graphicspage.cpp
2018-06-14 19:39:24 -05:00
Capostrophic
1abf749f03
Remove screenshot taken message
2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83
Handle exception if we try to play non-music file (bug #4416 )
2018-06-14 21:32:40 +04:00
Miloslav Číž
477e1437d2
Resolve conflicts
2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec
Add NPC validation to esmstore (bug #2772 )
2018-06-14 16:48:16 +04:00
Miloslav Číž
dd00e438fe
Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360
2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e
Add FIXME comment
2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360
2018-06-13 21:16:28 +02:00
Marc Zinnschlag
2b35c5efd7
Merge remote-tracking branch 'upstream/master'
2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb
Merged pull request #1753
2018-06-13 18:12:38 +02:00
Marc Zinnschlag
f62df90960
Merged pull request #1572
2018-06-13 18:11:31 +02:00
Andrei Kortunov
61c968d550
Ignore broken items when search for replacement (bug #4453 )
2018-06-13 18:39:02 +04:00
Marc Zinnschlag
7ca56ccd29
set search status bar to 'no results' message when search yields no results
2018-06-13 15:48:24 +02:00
Andrei Kortunov
81b78a82e8
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454 )
2018-06-13 17:47:32 +04:00
Marc Zinnschlag
7d2394273e
added statusbar to search window ( Fixes #3276 )
2018-06-13 14:55:03 +02:00
Miloslav Číž
dcfbd554bb
Remove try catch block
2018-06-13 11:12:46 +02:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
2018-06-13 10:04:32 +02:00
