Xenkhan
|
405a0caf29
|
Remove unneeded whitespace
|
7 years ago |
Xenkhan
|
5a4817c147
|
Get rid of reinterpret_cast<>
|
7 years ago |
Marc Zinnschlag
|
22eb037c18
|
Merged pull request #1773
|
7 years ago |
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
|
7 years ago |
Bret Curtis
|
b619c0de2d
|
Merge pull request #1772 from akortunov/deathanim
Fast-forward death animation to end if death animation was finished earlier
|
7 years ago |
Andrei Kortunov
|
c195144b17
|
Take transformation from first node with given name in file (bug #4469)
|
7 years ago |
Bret Curtis
|
664edc5a39
|
Merge pull request #1757 from akortunov/musicfix
Handle exception when try to load non-music file
|
7 years ago |
Andrei Kortunov
|
c9756cee4c
|
Fast-forward death animation to end if death animation was finished earlier (regression #4468)
|
7 years ago |
Xenkhan
|
24ddb66af9
|
Retrieve SDL window settings instead of using magic numbers
|
7 years ago |
Capostrophic
|
6c23caadd7
|
Fix crash when a target in a different cell is (un)locked
|
7 years ago |
Capostrophic
|
0c4fa55f16
|
Make Open spells casted by anything trigger player crime event (fixes #4461)
|
7 years ago |
Marc Zinnschlag
|
7cfb7063c2
|
Merged pull request #1767
|
7 years ago |
Marc Zinnschlag
|
7be069fcd2
|
Merged pull request #1743
|
7 years ago |
Andrei Kortunov
|
5fd3ec1035
|
Implement unlockable locks with 'lock 0' console command
|
7 years ago |
Marc Zinnschlag
|
a8ad530db9
|
Merged pull request #1749
|
7 years ago |
Marc Zinnschlag
|
2a52ade219
|
Merged pull request #1760
|
7 years ago |
Capostrophic
|
8376c8c68e
|
Allow partial matches in NotCell condition (fixes #4459)
|
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 |
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 |
Nikolay Kasyanov
|
359f87ab9f
|
Change imageToSurface to return a unique_ptr to avoid manual surface cleanup
|
7 years ago |
Andrei Kortunov
|
9c3da41130
|
Add murder bounty when a player follower commits murder (bug #2852)
|
7 years ago |
Capostrophic
|
1abf749f03
|
Remove screenshot taken message
|
7 years ago |
Andrei Kortunov
|
2854f6ca83
|
Handle exception if we try to play non-music file (bug #4416)
|
7 years ago |
Miloslav Číž
|
477e1437d2
|
Resolve conflicts
|
7 years ago |
Andrei Kortunov
|
49ba00a3ec
|
Add NPC validation to esmstore (bug #2772)
|
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 |
Andrei Kortunov
|
61c968d550
|
Ignore broken items when search for replacement (bug #4453)
|
7 years ago |
Andrei Kortunov
|
81b78a82e8
|
AI: try to open doors every AI_REACTION_TIME seconds (bug #4454)
|
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 |
Capostrophic
|
1c8a20a54a
|
Set ok button focus in settings window by default (fixes #4368)
|
7 years ago |
Andrei Kortunov
|
f299be8158
|
Play scripted animations even if SkipAnim is used
|
7 years ago |
Andrei Kortunov
|
25bb7c1826
|
Make 'PlayGroup idle' to cancel scripted animations
|
7 years ago |
Andrei Kortunov
|
0e441d48ac
|
Give scripted animations highest priority (bug #4286)
|
7 years ago |
Andrei Kortunov
|
0c92655250
|
Avoid code duplication in character manager
|
7 years ago |
Andrei Kortunov
|
e3812f4075
|
Check creature stats only for actors
|
7 years ago |
Andrei Kortunov
|
b0a140e714
|
Disable actor collision only after end of death animation
|
7 years ago |
Andrei Kortunov
|
ebaa6fb5a2
|
Play death scream only once
|
7 years ago |
Andrei Kortunov
|
427be928d0
|
Do not update animation state for dead actors
|
7 years ago |
Andrei Kortunov
|
977a27ecb7
|
Do not clear corpses until end of death animation (bug #4307)
|
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
|
a42c663fd7
|
Do not interrupt scripted animations by death animation (bug #4286)
|
7 years ago |
Andrei Kortunov
|
d0619cfb35
|
Play death animation for non-persisting actors with 0 health (bug #4291)
|
7 years ago |
Andrei Kortunov
|
6099735c60
|
Early out only when scripted animation is playing
|
7 years ago |
Andrei Kortunov
|
e234dd2a36
|
Do not interrupt scripted animations
|
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
|
76972bb2f6
|
Merged pull request #1709
|
7 years ago |
Andrei Kortunov
|
6ed2773299
|
Do not stack return packages
|
7 years ago |
Andrei Kortunov
|
74a2cbe696
|
AI: return back after pursuit
|
7 years ago |
Andrei Kortunov
|
3d0631cfcc
|
Store last AI package in savegame
|
7 years ago |
Andrei Kortunov
|
3a0ee78d2b
|
AiTravel: store mHidden flag in savegame
|
7 years ago |
Andrei Kortunov
|
2f5beb8853
|
Remove unnecessary hack
|
7 years ago |
Andrei Kortunov
|
57d686131e
|
Remove redundant condition
|
7 years ago |
Andrei Kortunov
|
5105c67642
|
Add mHidden field to AiTravel
|
7 years ago |
Andrei Kortunov
|
81f29d8dcd
|
AiWander: resume moving to destination after combat
|
7 years ago |
Andrei Kortunov
|
18ff097e4a
|
Add the parameter to AiSequence::stack() to control ability to cancel other AI packages
|
7 years ago |
Andrei Kortunov
|
9d27eb197f
|
AiWander: return to initial position only after combat
|
7 years ago |
Bret Curtis
|
61c969e970
|
Merge branch 'master' into hitboxfix
|
7 years ago |
Capostrophic
|
b274931165
|
Revert erroneous changes
|
7 years ago |
Capostrophic
|
dd2a11b243
|
Merge branch 'master' into goodbye
|
7 years ago |
Capostrophic
|
24c1ee7744
|
Use relative stat difference for haggling
|
7 years ago |
Capostrophic
|
b7026df551
|
Improve the offered price formula (Fixes #2222)
|
7 years ago |
Andrei Kortunov
|
fed10e87aa
|
Store integer actor ID in AI packages (bug #4036)
|
7 years ago |
Marc Zinnschlag
|
9d0ce25052
|
Merged pull request #1738
|
7 years ago |
Marc Zinnschlag
|
7899f44173
|
Merged pull request #1619
|
7 years ago |
Andrei Kortunov
|
fea34bd73f
|
Added support for per-group animation files
|
7 years ago |
Capostrophic
|
11103211c5
|
Make Goodbye and Choice choices mutually exclusive
|
7 years ago |
Marc Zinnschlag
|
21ea49fe83
|
Merge remote-tracking branch 'capostrophic/physics'
|
7 years ago |
Capostrophic
|
1a354f88ac
|
Make choices trigger goodbye if Goodbye is used (fixes #3897)
|
7 years ago |
Andrei Kortunov
|
1b9edbe119
|
Add unequip animation during stance switching (bug #4327)
|
7 years ago |
Andrei Kortunov
|
bde1d07d4e
|
Use hitboxes and focused object for touch spells (bug #3374)
|
7 years ago |
Andrei Kortunov
|
4666a6a0ab
|
Use default hit formula as fallback
|
7 years ago |
Andrei Kortunov
|
9e5d577a71
|
Aim from center of attacker to center of target
|
7 years ago |
Andrei Kortunov
|
f5dc9f0162
|
Use hitbox cone only as fallback
|
7 years ago |