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 |
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 |
AnyOldName3
|
5ce34f1cbf
|
Move new behaviour into macro to reduce code duplication
|
7 years ago |
|
AnyOldName3
|
3c0ec0d6d0
|
If CMake supports it, sets the debugger working directory for Visual Studio
|
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 |
Thunderforge
|
e0ffc94f3e
|
Fix OpenMW-CS internal name
|
7 years ago |
|
David Cernat
|
4468e6ec4a
|
Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
|
7 years ago |
|
scrawl
|
4fba157d3b
|
Implement releaseGLObjects for cached resources
|
7 years ago |
|
Marc Zinnschlag
|
91f674bb6f
|
Merge remote-tracking branch 'aesylwinn/master'
|
7 years ago |
Kyle Cooley
|
a8576d78ad
|
Change default topic info values
|
7 years ago |
|
Kyle Cooley
|
42b948dffe
|
Fix pathgrid segfault
|
7 years ago |
|
Kyle Cooley
|
157ecb166c
|
Fix wrong folder name
|
7 years ago |
|
Kyle Cooley
|
d3d04171f9
|
Fix seg fault, undo changes BsaArchive
|
7 years ago |
|
Kyle Cooley
|
8c4b12a603
|
VFS changes, one VFS and resource system per document.
Added ability to reset a VFS::Manager.
Removed ability to rebuild the index for a VFS::Manager.
Moved VFS creation to CSM::Data.
|
7 years ago |
|
Kyle Cooley
|
979b0d7211
|
Code cleanup and more cache clearing
|
7 years ago |
|
Kyle Cooley
|
3b9326d238
|
Clear terrain cache and reload terrain
|
7 years ago |
|
Kyle Cooley
|
d4a722067d
|
Reload water
|
7 years ago |
|
Kyle Cooley
|
d7744e8b16
|
A bit of cleanup
|
7 years ago |
|
Kyle Cooley
|
5950b26912
|
Update scene assets
|
7 years ago |
|
Kyle Cooley
|
742bd00ec6
|
Clear cached resources
|
7 years ago |
|
Kyle Cooley
|
d31ed83b54
|
Preliminary asset reloading
|
7 years ago |
|
Kyle Cooley
|
249c1ae95a
|
Fix orbit camera jumping back to old position
|
7 years ago |
|
David Cernat
|
690f7dc7df
|
Merge pull request #251 from OpenMW/master
Add OpenMW commits up to 27 Jul 2017, part 2
|
8 years ago |
Rob Cutmore
|
3f2cd9b669
|
Editor: Do color to int conversion in ColorEditor
|
8 years ago |
|
Rob Cutmore
|
c7241c692f
|
Editor: Do int to color conversion in ColorEditor
|
8 years ago |
|
Rob Cutmore
|
3fb7c42845
|
Editor: Use colour field for cell map colour
|
8 years ago |
|
Rob Cutmore
|
0082f5a2dc
|
Editor: fix handling of colour columns
Colours are stored as ints in the backend but the conversion from
QColor to int was broken.
|
8 years ago |
|
David Cernat
|
3d1458b5a2
|
Merge pull request #246 from OpenMW/master
Add OpenMW commits up to 24 Jul 2017
|
8 years ago |
|
PlutonicOverkill
|
16be1e1a84
|
Fix occurrence highlighting preferences panel
|
8 years ago |
|
David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
8 years ago |
Bret Curtis
|
c781d1f8ed
|
purge unnecessary imports
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
|
8 years ago |
|
Bret Curtis
|
d48b829b45
|
replace and purge boost::lexical_cast
|
8 years ago |
|
Bret Curtis
|
d97aa9152b
|
remove more unused imports, including boost headers
|
8 years ago |
|
Bret Curtis
|
39185e6f8c
|
purge the rest of boost::shared and any other boost related things that no longer are required
put boost system back in, clean others up
revert Qt
add back boost fstream
|
8 years ago |
Ewan Higgs
|
38a2de3c51
|
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
|
8 years ago |
|
David Cernat
|
da22639620
|
Merge pull request #216 from OpenMW/master
Add OpenMW commits up to 12 May 2017
|
8 years ago |
|
PlutonicOverkill
|
5ec97811d8
|
Don't switch pages when right-clicking on list
|
8 years ago |
|
PlutonicOverkill
|
7281e8b888
|
Remove C++11 features
|
8 years ago |
|
PlutonicOverkill
|
cd75c5618c
|
Move context menu code to PageBase
|
8 years ago |
|
PlutonicOverkill
|
16f8341de3
|
Prevent context menu appearing for modifier settings
|
8 years ago |
|
PlutonicOverkill
|
c2f427f48d
|
Prevent context menu appearing when right-clicking shortcut setting
|
8 years ago |
|
PlutonicOverkill
|
646ff72cdc
|
Add a more elegant way of showing the context menu
|
8 years ago |
|
PlutonicOverkill
|
bd9f657603
|
Show context menu when user clicks on empty space
|
8 years ago |
|
PlutonicOverkill
|
30af92f575
|
Fix pointer initialisation bug
|
8 years ago |
|
PlutonicOverkill
|
4879405097
|
Add reset context menu for key binding pages
|
8 years ago |