David Cernat
|
ecb0ad0d77
|
Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
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 |
Miloslav Číž
|
79527b746a
|
Remove unused variable
|
7 years ago |
Miloslav Číž
|
b246580c63
|
Fix orbit camera axis
|
7 years ago |
Miloslav Číž
|
e309dfd234
|
CS: Rename variables (AppVeyor fix)
|
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 |
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 |
David Cernat
|
e7f20e7daf
|
Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# README.md
|
7 years ago |
scrawl
|
a4d8aef40d
|
Merge branch openmw-43 into master
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
|
7 years ago |
David Cernat
|
22521578eb
|
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
|
7 years ago |
Kyle Cooley
|
eb23367175
|
Fix rendering depth/order issues
|
7 years ago |
Kyle Cooley
|
c8f79ea838
|
Adjust rotation markers
|
7 years ago |
Kyle Cooley
|
1cd539bad2
|
Fix render order for markers
|
7 years ago |
Kyle Cooley
|
556117f6e6
|
Update marker transparency when changed.
|
7 years ago |
Kyle Cooley
|
de214db8d4
|
Use configured transparency.
|
7 years ago |
Kyle Cooley
|
197ea95646
|
Prevent arrows for move/scale markers from intersecting.
|
7 years ago |
Kyle Cooley
|
492b99b008
|
Transparent object markers
|
7 years ago |
Alexander "Ace" Olofsson
|
3e51c9e6b3
|
Missed the OpenCS config file
|
7 years ago |
David Cernat
|
3a9e5e3a7b
|
Merge pull request #319 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
|
7 years ago |
Marc Zinnschlag
|
0b163f0a50
|
Merge remote-tracking branch 'aesylwinn/forceNewProject'
|
7 years ago |
Marc Zinnschlag
|
bdabace7e2
|
Merge remote-tracking branch 'aesylwinn/LLmerge'
|
7 years ago |
Kyle Cooley
|
6d8666d80d
|
Force new project file when creating new project
|
7 years ago |
David Cernat
|
260b3411c3
|
Merge pull request #317 from OpenMW/master
Add OpenMW commits up to 18 Oct 2017
|
7 years ago |
AnyOldName3
|
43e9e955c8
|
Do the same for the CS
|
7 years ago |
David Cernat
|
184c5f2b29
|
Merge pull request #315 from OpenMW/master
Add OpenMW commits up to 17 Oct 2017
|
7 years ago |
Kyle Cooley
|
6d7a24224b
|
Add documentation.
|
7 years ago |
AnyOldName3
|
654bd401fb
|
Switch openmw-cs to the escape versions of option types
|
7 years ago |
Kyle Cooley
|
11eae16645
|
Get rid of duplicate function, fix flag checking
|
7 years ago |
Kyle Cooley
|
d27071f06a
|
Fix LTEX import bug.
|
7 years ago |
Kyle Cooley
|
98c38ad7d1
|
Merge cleanup.
|
7 years ago |
Kyle Cooley
|
6d9d98c02c
|
Merge Land/LandTextures
|
7 years ago |
David Cernat
|
3e8d7c8416
|
Merge pull request #306 from OpenMW/master
Add OpenMW commits up to 7 Oct 2017
|
7 years ago |
Kyle Cooley
|
b14404e9cc
|
Fix region colors
|
7 years ago |
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
|
7 years ago |
Marc Zinnschlag
|
dd17f70068
|
Merge remote-tracking branch 'aesylwinn/landrecords'
|
7 years ago |
Kyle Cooley
|
2f5449a68c
|
Remove now unnecessary overrides.
|
7 years ago |
Kyle Cooley
|
137ea872d3
|
Hide base land textures.
|
7 years ago |
Kyle Cooley
|
dfcbee3ab1
|
Ignore case when comparing textures, also add new textures to lookup map.
|
7 years ago |
Kyle Cooley
|
1fe1ec63c4
|
Fix Qt4 build
|
7 years ago |
Kyle Cooley
|
3981f79d38
|
Change flag for base land textures
|
7 years ago |
Kyle Cooley
|
054e6a780e
|
Use map for texture lookup.
|
7 years ago |