Commit Graph

2882 Commits (365f485e8d3af609c4ddcddde9ecb042e24edc39)

Author SHA1 Message Date
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
Kyle Cooley 5d14a2afcc Initial LTEX/LAND tables 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 8 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
PlutonicOverkill 3545cfa00a Rewrite feature to reset options to default 8 years ago
PlutonicOverkill f30d1a3075 Revert everything 8 years ago
PlutonicOverkill a9760ec805 Fix indenting 8 years ago
PlutonicOverkill d8a711f89f Fix tabs 8 years ago
PlutonicOverkill 477af73ad6 Missed another one 8 years ago
PlutonicOverkill 418aeb65f1 Remove unneeded dependencies 8 years ago
PlutonicOverkill 5fca37d0c8 Forgot to remove debugging code 8 years ago
PlutonicOverkill dff3828710 Keep the settings page in sync with the real settings 8 years ago
PlutonicOverkill 64879c03e4 Add option to reset settings to default 8 years ago
David Cernat 79691254a4 Merge pull request #210 from OpenMW/master
Add OpenMW commits up to 3 May 2017
8 years ago
PlutonicOverkill 829560719e Make name highlighting more consistent and only for variable names 8 years ago
David Cernat cc3dfd7da0 Merge pull request #208 from OpenMW/master
Add OpenMW commits up to 28 Apr 2017
8 years ago
PlutonicOverkill 95f60d2bb3 Merge branch 'master' into mark-variable 8 years ago
PlutonicOverkill cbb2b8b119 Add setting so feature can be turned off 8 years ago
PlutonicOverkill a8e7628e83 Enable highlighting when cursor is placed over a name (script editor) 8 years ago
Marc Zinnschlag 7919c4d672 Merge remote-tracking branch 'plutonicoverkill/master' 8 years ago
PlutonicOverkill e685de0f84 Fix script editor undo/redo context menu actions 8 years ago
PlutonicOverkill 6063d8e31b Fix existing context menu in script editor 8 years ago
David Cernat 752848834a Merge pull request #207 from OpenMW/master
Add OpenMW commits up to 26 Apr 2017
8 years ago
Marc Zinnschlag 61e6b0d03c improved ScriptErrorTable handling of script errors that don't have line/column associated with them (also avoiding a segfault) 8 years ago
PlutonicOverkill 3d1e640388 Add setting to change keyboard shortcut and fix another crash 8 years ago
PlutonicOverkill 1f699552f7 Fix infinite recursion bug in uncommentSelection() 8 years ago
PlutonicOverkill 61e374fdfc Implement commentSelection() and uncommentSelection() 8 years ago
PlutonicOverkill 83ff7d162c Add comment/uncomment actions to the context menu 8 years ago
David Cernat 6557577c03 Merge pull request #193 from OpenMW/master
Add OpenMW commits up to 7 March 2017
8 years ago
Rob Cutmore 0ff56677f6 Remove unused code 8 years ago
Rob Cutmore 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
Rob Cutmore 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
David Cernat dff52d8fbe Merge pull request #191 from OpenMW/master
Add OpenMW commits up to 31 Mar 2017
8 years ago
Marc Zinnschlag ab8294b281 Merge remote-tracking branch 'rcutmore/bug-2838' 8 years ago
Rob Cutmore 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