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 |
|
Kyle Cooley
|
4921e7f5c1
|
Get rid of reinterpret cast.
|
7 years ago |
|
David Cernat
|
4d4eb1bb9f
|
Merge pull request #292 from OpenMW/master
Add OpenMW commits up to 18 Sep 2017
|
7 years ago |
|
Marc Zinnschlag
|
e6caacec04
|
Merge remote-tracking branch 'plutonicoverkill/pref-pane-width'
|
7 years ago |
|
Kyle Cooley
|
50d9d9f78f
|
Get rid of some templates, exceptions instead of assert, and other small changes.
|
7 years ago |
PlutonicOverkill
|
5e60fb7c10
|
Fix preferences pane width
|
7 years ago |
|
David Cernat
|
bd541b1e5b
|
Merge pull request #287 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
|
7 years ago |
scrawl
|
bd667c3847
|
Merge pull request #1435 from AnyOldName3/cmake-vs-debugging-dir
If CMake supports it, sets the debugger working directory for Visual …
|
7 years ago |
|
Marc Zinnschlag
|
9a8a4c744f
|
Merge remote-tracking branch 'capostrophic/controlplus'
|
7 years ago |
Capostrophic
|
97ff24b8d6
|
Change ctl to ctrl in OpenMW-CS shortcut manager
|
7 years ago |
|
Kyle Cooley
|
25d4a0370f
|
Changes to land data access in tables, also update Land once per frame in scene view.
|
7 years ago |
|
Kyle Cooley
|
d030b595f8
|
Fix potential segfault, cleanup, get rid of warnings.
|
7 years ago |
|
Kyle Cooley
|
72cb405de2
|
Some bug fixes, changes to land load code.
|
7 years ago |
|
AnyOldName3
|
5ce34f1cbf
|
Move new behaviour into macro to reduce code duplication
|
7 years ago |
|
Kyle Cooley
|
2eacc2f093
|
Changes to land creation, add ability to specifically clear terrain cache
|
7 years ago |
|
AnyOldName3
|
3c0ec0d6d0
|
If CMake supports it, sets the debugger working directory for Visual Studio
|
7 years ago |
|
Kyle Cooley
|
ab607f3028
|
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
|
7 years ago |
|
Kyle Cooley
|
99e90ef808
|
Cleanup. Also modify ltex index generation.
|
7 years ago |
|
Kyle Cooley
|
97d0fd756a
|
LTEX importing
|
7 years ago |
|
Kyle Cooley
|
5c3e90da88
|
Fix includes
|
7 years ago |
|
Kyle Cooley
|
d3014cf394
|
Temporary fix for adding new lands, cloned lands will still reference old data though
|
7 years ago |
|
David Cernat
|
b64f379949
|
Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
|
7 years ago |
|
Kyle Cooley
|
90c485104a
|
Land creator
|
7 years ago |
|
Kyle Cooley
|
7cc95a11a4
|
Add more land table columns
|
7 years ago |
|
Kyle Cooley
|
30ba1d4c25
|
Move touch command to creator, to allow customization and not break abstraction
|
7 years ago |
Thunderforge
|
e0ffc94f3e
|
Fix OpenMW-CS internal name
|
7 years ago |
|
Kyle Cooley
|
1d480015b4
|
Add ability to touch records, LAND records in particular
|
7 years ago |
|
Kyle Cooley
|
9e41f1340a
|
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
|
7 years ago |