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
scrawl
6a745cb2cc
Fix text colorMode (Bug #3815 ) and render bin
8 years ago
Rob Cutmore
77bf1efc1a
Editor: Fix labels for creator user inputs
8 years ago
Rob Cutmore
8d4441bb5e
Editor: document subclasses without ID checks
...
- Removes ID validation for PathgridCreator.
- Adds comments explaining why ID validation isn't used in some cases.
8 years ago