ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
01f9d90315
CS: Reorder 3D input menu
7 years ago
13dc1bd41e
CS: Add tooltip to camera-ortho-size preference
7 years ago
1f5feeddb9
CS: Change camera parameter types to int
7 years ago
f2777f7242
CS: Mover object-marker-alpha under Rendering
7 years ago
79527b746a
Remove unused variable
7 years ago
b246580c63
Fix orbit camera axis
7 years ago
e309dfd234
CS: Rename variables (AppVeyor fix)
7 years ago
199e41833f
Merge branch 'master' into cs-cam
7 years ago
d85f8deaa3
CS: Add fixed roll setting, plus ortho fix
7 years ago
1b77e3ed62
CS: Add ortho camera setting
7 years ago
bfad5ebde4
CS: Fix camera orbit control with keys
7 years ago
5e076ee015
CS: Fix camera orbit with arbitrary roll
7 years ago
cfdc6c788e
CS: Make camera FOV change dynamically
7 years ago
7d36dd68dc
CS: Make orbit camera not change roll
7 years ago
360d786ff2
CS: Add rendering prefs and camera FOV
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
7 years ago
eb23367175
Fix rendering depth/order issues
7 years ago
c8f79ea838
Adjust rotation markers
7 years ago
1cd539bad2
Fix render order for markers
7 years ago
556117f6e6
Update marker transparency when changed.
7 years ago
de214db8d4
Use configured transparency.
7 years ago
197ea95646
Prevent arrows for move/scale markers from intersecting.
7 years ago
492b99b008
Transparent object markers
7 years ago
3e51c9e6b3
Missed the OpenCS config file
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
0b163f0a50
Merge remote-tracking branch 'aesylwinn/forceNewProject'
7 years ago
bdabace7e2
Merge remote-tracking branch 'aesylwinn/LLmerge'
7 years ago
6d8666d80d
Force new project file when creating new project
7 years ago
260b3411c3
Merge pull request #317 from OpenMW/master
...
Add OpenMW commits up to 18 Oct 2017
7 years ago
43e9e955c8
Do the same for the CS
7 years ago
184c5f2b29
Merge pull request #315 from OpenMW/master
...
Add OpenMW commits up to 17 Oct 2017
7 years ago
6d7a24224b
Add documentation.
7 years ago
654bd401fb
Switch openmw-cs to the escape versions of option types
7 years ago
11eae16645
Get rid of duplicate function, fix flag checking
7 years ago
d27071f06a
Fix LTEX import bug.
7 years ago
98c38ad7d1
Merge cleanup.
7 years ago
6d9d98c02c
Merge Land/LandTextures
7 years ago
3e8d7c8416
Merge pull request #306 from OpenMW/master
...
Add OpenMW commits up to 7 Oct 2017
7 years ago
b14404e9cc
Fix region colors
7 years ago
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
dd17f70068
Merge remote-tracking branch 'aesylwinn/landrecords'
7 years ago
2f5449a68c
Remove now unnecessary overrides.
7 years ago
137ea872d3
Hide base land textures.
7 years ago
dfcbee3ab1
Ignore case when comparing textures, also add new textures to lookup map.
7 years ago
1fe1ec63c4
Fix Qt4 build
7 years ago
3981f79d38
Change flag for base land textures
7 years ago
054e6a780e
Use map for texture lookup.
7 years ago
4921e7f5c1
Get rid of reinterpret cast.
7 years ago
4d4eb1bb9f
Merge pull request #292 from OpenMW/master
...
Add OpenMW commits up to 18 Sep 2017
7 years ago
e6caacec04
Merge remote-tracking branch 'plutonicoverkill/pref-pane-width'
7 years ago
50d9d9f78f
Get rid of some templates, exceptions instead of assert, and other small changes.
7 years ago
5e60fb7c10
Fix preferences pane width
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
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
9a8a4c744f
Merge remote-tracking branch 'capostrophic/controlplus'
7 years ago
97ff24b8d6
Change ctl to ctrl in OpenMW-CS shortcut manager
7 years ago
25d4a0370f
Changes to land data access in tables, also update Land once per frame in scene view.
7 years ago
d030b595f8
Fix potential segfault, cleanup, get rid of warnings.
7 years ago
72cb405de2
Some bug fixes, changes to land load code.
7 years ago
5ce34f1cbf
Move new behaviour into macro to reduce code duplication
7 years ago
2eacc2f093
Changes to land creation, add ability to specifically clear terrain cache
7 years ago
3c0ec0d6d0
If CMake supports it, sets the debugger working directory for Visual Studio
7 years ago
ab607f3028
Tweaks to land loading, land cloning, terrain signals, placeholder land update handling
7 years ago
99e90ef808
Cleanup. Also modify ltex index generation.
7 years ago
97d0fd756a
LTEX importing
7 years ago
5c3e90da88
Fix includes
7 years ago
d3014cf394
Temporary fix for adding new lands, cloned lands will still reference old data though
7 years ago
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
90c485104a
Land creator
7 years ago
7cc95a11a4
Add more land table columns
7 years ago
30ba1d4c25
Move touch command to creator, to allow customization and not break abstraction
7 years ago
e0ffc94f3e
Fix OpenMW-CS internal name
7 years ago
1d480015b4
Add ability to touch records, LAND records in particular
7 years ago
9e41f1340a
Replace nonconst getId with setId, add template specialization and specialized derived classes for LandTexture
7 years ago
5d14a2afcc
Initial LTEX/LAND tables
7 years ago
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
4fba157d3b
Implement releaseGLObjects for cached resources
7 years ago
91f674bb6f
Merge remote-tracking branch 'aesylwinn/master'
7 years ago
a8576d78ad
Change default topic info values
7 years ago
42b948dffe
Fix pathgrid segfault
7 years ago
157ecb166c
Fix wrong folder name
7 years ago
d3d04171f9
Fix seg fault, undo changes BsaArchive
7 years ago
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
979b0d7211
Code cleanup and more cache clearing
7 years ago
3b9326d238
Clear terrain cache and reload terrain
7 years ago
d4a722067d
Reload water
7 years ago
d7744e8b16
A bit of cleanup
7 years ago
5950b26912
Update scene assets
7 years ago
742bd00ec6
Clear cached resources
7 years ago
d31ed83b54
Preliminary asset reloading
7 years ago
249c1ae95a
Fix orbit camera jumping back to old position
7 years ago
690f7dc7df
Merge pull request #251 from OpenMW/master
...
Add OpenMW commits up to 27 Jul 2017, part 2
8 years ago
3f2cd9b669
Editor: Do color to int conversion in ColorEditor
8 years ago
c7241c692f
Editor: Do int to color conversion in ColorEditor
8 years ago
3fb7c42845
Editor: Use colour field for cell map colour
8 years ago
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
3d1458b5a2
Merge pull request #246 from OpenMW/master
...
Add OpenMW commits up to 24 Jul 2017
8 years ago
16be1e1a84
Fix occurrence highlighting preferences panel
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
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
d48b829b45
replace and purge boost::lexical_cast
8 years ago
d97aa9152b
remove more unused imports, including boost headers
8 years ago
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
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
da22639620
Merge pull request #216 from OpenMW/master
...
Add OpenMW commits up to 12 May 2017
8 years ago
5ec97811d8
Don't switch pages when right-clicking on list
8 years ago
7281e8b888
Remove C++11 features
8 years ago
cd75c5618c
Move context menu code to PageBase
8 years ago
16f8341de3
Prevent context menu appearing for modifier settings
8 years ago
c2f427f48d
Prevent context menu appearing when right-clicking shortcut setting
8 years ago
646ff72cdc
Add a more elegant way of showing the context menu
8 years ago
bd9f657603
Show context menu when user clicks on empty space
8 years ago
30af92f575
Fix pointer initialisation bug
8 years ago
4879405097
Add reset context menu for key binding pages
8 years ago
3545cfa00a
Rewrite feature to reset options to default
8 years ago
f30d1a3075
Revert everything
8 years ago
a9760ec805
Fix indenting
8 years ago
d8a711f89f
Fix tabs
8 years ago
477af73ad6
Missed another one
8 years ago
418aeb65f1
Remove unneeded dependencies
8 years ago
5fca37d0c8
Forgot to remove debugging code
8 years ago
dff3828710
Keep the settings page in sync with the real settings
8 years ago
64879c03e4
Add option to reset settings to default
8 years ago
79691254a4
Merge pull request #210 from OpenMW/master
...
Add OpenMW commits up to 3 May 2017
8 years ago
829560719e
Make name highlighting more consistent and only for variable names
8 years ago
cc3dfd7da0
Merge pull request #208 from OpenMW/master
...
Add OpenMW commits up to 28 Apr 2017
8 years ago
95f60d2bb3
Merge branch 'master' into mark-variable
8 years ago
cbb2b8b119
Add setting so feature can be turned off
8 years ago
a8e7628e83
Enable highlighting when cursor is placed over a name (script editor)
8 years ago
7919c4d672
Merge remote-tracking branch 'plutonicoverkill/master'
8 years ago
e685de0f84
Fix script editor undo/redo context menu actions
8 years ago
6063d8e31b
Fix existing context menu in script editor
8 years ago
752848834a
Merge pull request #207 from OpenMW/master
...
Add OpenMW commits up to 26 Apr 2017
8 years ago
61e6b0d03c
improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault)
8 years ago
3d1e640388
Add setting to change keyboard shortcut and fix another crash
8 years ago
1f699552f7
Fix infinite recursion bug in uncommentSelection()
8 years ago
61e374fdfc
Implement commentSelection() and uncommentSelection()
8 years ago
83ff7d162c
Add comment/uncomment actions to the context menu
8 years ago
6557577c03
Merge pull request #193 from OpenMW/master
...
Add OpenMW commits up to 7 March 2017
8 years ago
0ff56677f6
Remove unused code
8 years ago
84bad9316d
Editor: flag orbit camera for re-initialization
...
After swapping cells the orbit cam controller needs to be
re-initialized to properly center on the new cell.
8 years ago
f7664d4bb9
Editor: reset camera after cell drag and drop
...
When replacing a viewed cell via drag and drop the camera position is
not updated to better view the new cell. This flags the camera position
as not being set so a better default is set.
8 years ago
dff52d8fbe
Merge pull request #191 from OpenMW/master
...
Add OpenMW commits up to 31 Mar 2017
8 years ago
ab8294b281
Merge remote-tracking branch 'rcutmore/bug-2838'
8 years ago
343f2cb81d
Editor: add creator for body parts
...
Added creator subclass for body parts to allow adding first person
parts. IDs for first person body parts are expected to end with ".1st".
8 years ago
6a745cb2cc
Fix text colorMode (Bug #3815 ) and render bin
8 years ago
77bf1efc1a
Editor: Fix labels for creator user inputs
8 years ago
David Cernat
Miloslav Číž
scrawl
Kyle Cooley
Alexander "Ace" Olofsson
Marc Zinnschlag
AnyOldName3
PlutonicOverkill
Capostrophic
Thunderforge
Rob Cutmore
Bret Curtis
Ewan Higgs
scrawl