David Cernat
|
ecb0ad0d77
|
Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
7 years ago |
scrawl
|
b8c25e6bff
|
Use the correct priority of animation sources in getStartTime (Fixes #4263)
|
7 years ago |
Marc Zinnschlag
|
7245b251e8
|
Merge remote-tracking branch 'drummyfish/cs-cam'
|
7 years ago |
|
Marc Zinnschlag
|
93716cecd9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
scrawl
|
993982628d
|
Merge pull request #1590
|
7 years ago |
Andrei Kortunov
|
1a58171e86
|
Do not allow to sell items from containers with zero capacity (bug #4268)
|
7 years ago |
Bret Curtis
|
1c25b7ca57
|
Merge pull request #1589 from Thunderforge/build/setting-cmake-cxx-standard
Explicitly setting CMAKE_CXX_STANDARD to C++11
|
7 years ago |
Thunderforge
|
e4a1b6b5b8
|
Explicitly setting CMAKE_CXX_STANDARD to C++11
|
7 years ago |
Miloslav Číž
|
01f9d90315
|
CS: Reorder 3D input menu
|
7 years ago |
|
Miloslav Číž
|
13dc1bd41e
|
CS: Add tooltip to camera-ortho-size preference
|
7 years ago |
|
Miloslav Číž
|
1f5feeddb9
|
CS: Change camera parameter types to int
|
7 years ago |
|
Miloslav Číž
|
f2777f7242
|
CS: Mover object-marker-alpha under Rendering
|
7 years ago |
|
Marc Zinnschlag
|
ecf1cea1b7
|
Merge remote-tracking branch 'drummyfish/cs-cam'
|
7 years ago |
|
Miloslav Číž
|
79527b746a
|
Remove unused variable
|
7 years ago |
|
Miloslav Číž
|
b246580c63
|
Fix orbit camera axis
|
7 years ago |
|
scrawl
|
ccd8ca2e69
|
Merge pull request #1586
|
7 years ago |
|
scrawl
|
b6ac1c5697
|
Merge pull request #1587
|
7 years ago |
|
scrawl
|
269c3227ea
|
Make sure we have cmake for the before_install step
|
7 years ago |
|
Andrei Kortunov
|
ba46473038
|
Do not skip weather transitions from SetPos script command (bug #3603)
|
7 years ago |
|
scrawl
|
e9ecaf712b
|
Merge pull request #1584
|
7 years ago |
|
scrawl
|
7d62f05f81
|
Merge pull request #1583
|
7 years ago |
|
scrawl
|
70661a4b1c
|
Merge pull request #1585
|
7 years ago |
|
Andrei Kortunov
|
0e04a26ef6
|
Set duration of magic effects from ingredients (bug #4261)
|
7 years ago |
|
Andrei Kortunov
|
c908ad2fba
|
Do not allow to place actors underground via SetPos (bug #3783)
|
7 years ago |
Chris Robinson
|
08e947319a
|
Restore exception throwing to the decoder
|
7 years ago |
|
Chris Robinson
|
06ae61479a
|
If a sound effect fails to load, substitute silence.
|
7 years ago |
|
Miloslav Číž
|
e309dfd234
|
CS: Rename variables (AppVeyor fix)
|
7 years ago |
|
scrawl
|
9cee439e37
|
Merge pull request #1577
|
7 years ago |
|
scrawl
|
1d823d8ae1
|
Merge pull request #1579
|
7 years ago |
|
scrawl
|
b12cd1f5b2
|
Merge pull request #1581
|
7 years ago |
|
Miloslav Číž
|
c979a9e34f
|
Merge branch 'master' into cs-cam
|
7 years ago |
|
Miloslav Číž
|
199e41833f
|
Merge branch 'master' into cs-cam
|
7 years ago |
|
Miloslav Číž
|
d85f8deaa3
|
CS: Add fixed roll setting, plus ortho fix
|
7 years ago |
|
Miloslav Číž
|
1b77e3ed62
|
CS: Add ortho camera setting
|
7 years ago |
|
Miloslav Číž
|
bfad5ebde4
|
CS: Fix camera orbit control with keys
|
7 years ago |
|
Chris Robinson
|
aecf74e7bb
|
Don't throw exceptions from the audio decoder
|
7 years ago |
|
Miloslav Číž
|
5e076ee015
|
CS: Fix camera orbit with arbitrary roll
|
7 years ago |
|
Miloslav Číž
|
cfdc6c788e
|
CS: Make camera FOV change dynamically
|
7 years ago |
|
Miloslav Číž
|
7d36dd68dc
|
CS: Make orbit camera not change roll
|
7 years ago |
|
Miloslav Číž
|
360d786ff2
|
CS: Add rendering prefs and camera FOV
|
7 years ago |
|
Andrei Kortunov
|
744859f327
|
Take in account armor condition in the armor rating calculation (bug #4246)
|
7 years ago |
Allofich
|
7e87ce8787
|
Prevent combat on/off cycling for calmed actors
|
7 years ago |
|
Allofich
|
e0c54b3f39
|
Stop guards trying to arrest player when calm
(Fixes #3863)
|
7 years ago |
|
Andrei Kortunov
|
a28cc37501
|
Do not sell ingredients from organic containers
|
7 years ago |
|
scrawl
|
d2b3f902c7
|
Merge pull request #1576
|
7 years ago |
|
Andrei Kortunov
|
29b2308b2c
|
Do not display cyrillic soft/hard signs in the journal index
|
7 years ago |
|
Andrei Kortunov
|
b6ae7f3cc8
|
Do not add greetings to the journal index (bug #4342)
|
7 years ago |
|
scrawl
|
441420225f
|
Contributing.md: referencing issues in commit messages
|
7 years ago |
|
David Cernat
|
07f0cc2b0e
|
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
|
7 years ago |
|
scrawl
|
58de366c21
|
Merge pull request #1574
|
7 years ago |