Commit Graph

14420 Commits (2a52ade21982e449435933494a7b8c6e4e844624)

Author SHA1 Message Date
Marc Zinnschlag 2a52ade219 Merged pull request #1760 7 years ago
Bret Curtis e93104a6b3
Merge pull request #1758 from Capostrophic/screenshot
Remove screenshot taken message again
7 years ago
Bret Curtis 70dec71c00
Merge pull request #1763 from akortunov/activatedoor
Forbid actors to use teleporting doors
7 years ago
Bret Curtis 3cc6da1db2
Update door.cpp
typo fix
7 years ago
Bret Curtis 3f2dbdc8a8
Merge branch 'master' into wanderfix 7 years ago
Bret Curtis ecfc5fcd63
Merge pull request #1764 from akortunov/lightfix
Ignore lights without CanCarry flags when NPC selects torch
7 years ago
Andrei Kortunov f3f7487664 Fix arguments parsing for AiWander console command (bug #4458) 7 years ago
Andrei Kortunov e08b0d3070 Ignore lights without CanCarry flags when NPC selects torch (bug #4457) 7 years ago
Andrei Kortunov 2a65aaf5ab Forbid actors to use teleporting doors (bug #2562) 7 years ago
Bret Curtis 3f88aa46d0
Merge pull request #1759 from Thunderforge/refactor-launcher-sdl
Refactor SDL loading in Launcher to fix macOS errors
7 years ago
Andrei Kortunov 9c3da41130 Add murder bounty when a player follower commits murder (bug #2852) 7 years ago
Thunderforge 506d615acc Moving csignal import from main to graphicspage 7 years ago
Thunderforge 7615e78e52 Move SDL initialization from main.cpp to graphicspage.cpp 7 years ago
Capostrophic 1abf749f03
Remove screenshot taken message 7 years ago
Miloslav Číž 477e1437d2 Resolve conflicts 7 years ago
Miloslav Číž dd00e438fe Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360 7 years ago
Miloslav Číž 7178ee3a6e Add FIXME comment 7 years ago
Miloslav Číž d629c30fdb
Merge branch 'master' into screenshot360 7 years ago
Marc Zinnschlag 2b35c5efd7 Merge remote-tracking branch 'upstream/master' 7 years ago
Marc Zinnschlag aea481eacb Merged pull request #1753 7 years ago
Marc Zinnschlag f62df90960 Merged pull request #1572 7 years ago
Andrei Kortunov 61c968d550 Ignore broken items when search for replacement (bug #4453) 7 years ago
Marc Zinnschlag 7ca56ccd29 set search status bar to 'no results' message when search yields no results 7 years ago
Andrei Kortunov 81b78a82e8 AI: try to open doors every AI_REACTION_TIME seconds (bug #4454) 7 years ago
Marc Zinnschlag 7d2394273e added statusbar to search window (Fixes #3276) 7 years ago
Miloslav Číž dcfbd554bb Remove try catch block 7 years ago
Bret Curtis 3e4dc31e39
Merge branch 'master' into fatigue 7 years ago
Marc Zinnschlag 1ba0317905 Merged pull request #1670 7 years ago
Marc Zinnschlag 48711bbdde Merged pull request #1592 7 years ago
Miloslav Číž c3d7ee5a9e Resolve merge conflicts 7 years ago
Miloslav Číž db8aaa74d6 Start cell border debug drawing 7 years ago
Andrei Kortunov 9c45cc7e48 Use player reference instead of pointer 7 years ago
Marc Zinnschlag a3911f52a0 Merged pull request #1750 7 years ago
Marc Zinnschlag 97773697a9 Merge remote-tracking branch 'florianjw/precise-rotations' 7 years ago
Capostrophic 1c8a20a54a Set ok button focus in settings window by default (fixes #4368) 7 years ago
Bret Curtis 7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
Do not show any book text after last <BR> tag
7 years ago
Andrei Kortunov 66a46ff03c Do not show any book text after last <BR> tag. 7 years ago
Capostrophic d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 7 years ago
Andrei Kortunov acd3cba5fa Store previous items in the savegame 7 years ago
Andrei Kortunov 9fd2d57b86 Move previous items to player 7 years ago
Andrei Kortunov f977c6876f Bound items: store item ID instead of pointer 7 years ago
Andrei Kortunov 4de9d9fa77 Split adjustBoundItem() 7 years ago
Andrei Kortunov d1b1cb748d Reequip previous item only if the expired bound item was equipped 7 years ago
Andrei Kortunov 9b72a6ac69 Use the MWWorld::Ptr() instead of string ID 7 years ago
Andrei Kortunov 0375bedab2 Equip previous item after a bound item expires (bug #2326) 7 years ago
Andrei Kortunov ae87e0d3fc Do not reset mUpperBodyState for weapon->weapon switch (regression #4446) 7 years ago
Andrei Kortunov 4ba361fea6 Unhardcode sunset and sunrise settings (bug #1990) 7 years ago
Marc Zinnschlag 7d9de93fd3 Merged pull request #1477 7 years ago
Marc Zinnschlag 551a69f1b1 Merged pull request #1559 7 years ago
Marc Zinnschlag efb4abbb7f Merged pull request #1623 7 years ago