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
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
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
8 years ago
3714c2a0f2
Editor: add ID validator to pathgrid input
8 years ago
207695e094
Editor: switch input for pathgrid creator
...
Switched from QComboBox to DropLineEdit for pathgrid creator input.
This allows the input the use auto-complete and be a drop target from
the cells table.
8 years ago
0dcb6a9bd4
Editor: update pathgrid creator input on changes
...
When data changes the cell input for pathgrid creator is repopulated
with valid choices. This handles the case where a cell is added or
removed, and also when a cell's pathgrid is added or completely
removed.
8 years ago
491fd3d0be
Editor: set combo box events for pathgrid creator
...
- Handles when combo box should automatically gain or lose focus.
- Checks user input when combo box selection changes.
8 years ago
95d164a6e6
Editor: use combo box when creating pathgrids
...
Instead of using QLineEdit for user input, use a QComboBox populated
with valid choices. This prevents user from being able to create a
pathgrid for a non-existent cell.
8 years ago
60037e4081
Merge pull request #185 from OpenMW/master
...
Add OpenMW commits up to 14 Mar 2017
8 years ago
14225a42c6
Remove unused pointer to IncrementalCompileOperation
8 years ago
5eff286c71
Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps.
8 years ago
5fb854036d
Use a forward declaration to avoid having to workaround Qt MOC
...
Don't think that guard was still needed, but a forward declaration is better anyways.
8 years ago
80a0398f9d
Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads
8 years ago
35d53acc65
Factor out terrain chunk loading/caching into a new resource manager
8 years ago
9a3a64f0c4
Add resource manager for ESM::Land to allow data to be unloaded when no longer required
8 years ago
0d6636018f
Merge pull request #166 from OpenMW/master
...
Add OpenMW commits up to 23 Feb 2017
8 years ago
e9076088ca
Another tab fix
8 years ago
4e7f7cf84f
Fixed tabs
8 years ago
370c12e78a
Verification results are ordered by Type in alphabetical order.
8 years ago
cdffbc05f7
Merge pull request #159 from OpenMW/master
...
Add OpenMW commits up to 19 Feb 2017
8 years ago
fb8a2093cd
Replace "Female" check box with a combo box, part 2/2 ( fixes #3757 )
...
Replaces the "Female" check box in BodyPart records with a "Gender" combo box. This is the second of two related fixes, the first one covering NPC records.
Related issue:
- Fixes #3757 : Editor: Replace "Female" check box in BodyPart records with "Gender" combo box (https://bugs.openmw.org/issues/3757 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several BodyPart records.
8 years ago
fd4827b3a7
Merge pull request #157 from OpenMW/master
...
Add OpenMW commits up to 18 Feb 2017, part 2
8 years ago
520e82ed4f
Fix for commit "affc0eb..." in PR 1216 ( fixes #3756 )
...
Fixed use of tab character.
8 years ago
affc0eb37f
Replace "Female" check box with a combo box, part 1/2 ( fixes #3756 )
...
Replaces the "Female" check box in NPC records with a "Gender" combo box. This is the first of two related fixes, the second one covering BodyPart records.
Related issue:
- Fixes #3756 : Editor: Replace "Female" check box in NPC records with "Gender" combo box (https://bugs.openmw.org/issues/3756 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC records.
8 years ago
e0bc557aa4
Merge pull request #154 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017
8 years ago
dab8b328c4
Replace light emitter check boxes with a combo box ( fixes #3752 )
...
Replaces the four emitter check boxes in Light records with an "Emitter Type" combo box.
Related issue:
- Fixes #3752 : Editor: Replace emitter check boxes in Light records with "Emitter Type" combo box (https://bugs.openmw.org/issues/3752 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Light records. Please note that this fix also prevents users from erroneously assigning two or more emitter types at the same time. (I don't know which one would prevail in that case.)
8 years ago
c32c004516
Merge pull request #151 from OpenMW/master
...
Add OpenMW commits up to 16 Feb 2017
8 years ago
7be46eb1f0
Fix for commit "d4972ab..." in PR 1208 ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Fix:
- corrected false logic operation in refidadapterimp.cpp
- corrected names of the used flags
8 years ago
d4972ab166
Replace "Xyz blood" check boxes with a combo box ( fixes #3751 )
...
Replaces the two "Xyz blood" check boxes in NPC and Creature records with a "Blood Type" combo box.
Related issue:
- Fixes #3751 : OpenMW-CS: Replace "Xyz Blood" check boxes in NPC and Creature records with "Blood Type" combo box (https://bugs.openmw.org/issues/3751 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several NPC and Creature records. Please note that this fix also prevents users from erroneously assigning two blood types at the same time. (I don't know which one would prevail in that case.)
8 years ago
e46fb1770c
Merge remote-tracking branch 'matahualpa/openmw-cs_booktype'
8 years ago
2c34a8706b
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
8 years ago
607bd8b853
Replace "Scroll" check box with a combo box ( fixes #3748 )
...
Replaces the "Scroll" check box in Book records with a "Book Type" combo box.
Related issue:
- Fixes #3748 : OpenMW-CS: Replace "Scroll" check box in Book records with "Book Type" combo box. (https://bugs.openmw.org/issues/3748 )
Tests:
The changes were successfully tested in OpenMW-CS by manipulating several Book records. Please note that the actual logic behind this entry is not implemented yet: Books which are of type "Scroll" can have an enchantment attached, normal books ("Book") cannot.
8 years ago
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
8 years ago
ddd6605608
Move WNAM out of LandData to avoid redundant (de)allocations on startup
8 years ago
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
8 years ago
c5dcfe0794
Update refidadapterimp.cpp
...
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
6587880171
Update refidcollection.cpp
...
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746 : OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
8 years ago
d9f5dfe65c
Merge pull request #138 from OpenMW/master
...
Add OpenMW commits up to 2 Feb 2017
8 years ago
625c5040ce
Fix build
8 years ago
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
8 years ago
960d4a96c3
Reduce the number of osg::Material state by setting the default state on the graph root
8 years ago
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
34389e15cd
Merge remote-tracking branch 'origin/master'
8 years ago
827c78a4cd
added text column to ref id table (books)
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
c7b4b2cdd7
Fixed multiple spelling mistakes
8 years ago
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
8 years ago
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
b028f0b51f
Merge pull request #104 from OpenMW/master
...
Add OpenMW commits up to 17 Nov
8 years ago
c18fc113e5
Changed missing library dependencies to simple fix
8 years ago
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
59eba1dede
Changed tabs to spaces, oops
8 years ago
86b4673539
Removed math constants in openmw-cs, which are apparently not going to be used
8 years ago
1861302dbd
Include various libraries for Visual Studio environment
8 years ago
cd798d5f23
Merge pull request #89 from OpenMW/master
...
Add OpenMW commits up to 30 Oct
8 years ago
e5cb7306c3
Merge pull request #1115 from Allofich/conversion
...
Fix narrowing conversion warning
8 years ago
68ed264f40
Fix narrowing conversion warning
8 years ago
125e94ef0e
Fix shadowing warnings
8 years ago
47ebd24b4a
Merge pull request #79 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
ccacad51be
Fix shadowing warnings
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
1c54f54ab8
Fix shadowing warnings
8 years ago
53b006eccb
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification ( Fixes #3564 )
8 years ago
8be8c7ca66
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564 )
8 years ago
95a67bf0c2
Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads
...
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
8 years ago
add1a5e5b2
Merge pull request #72 from OpenMW/master
...
Add OpenMW commits up to 30 Sep
8 years ago
e918474a94
Merge remote-tracking branch 'rcutmore/bug-3277'
8 years ago
8f47ed17df
Show nested tables only when they are editable
8 years ago
b59694c4f0
Set tooltip for read-only nested tables
8 years ago
7e4543ffcb
Merge pull request #64 from OpenMW/master
...
Add OpenMW commits up to 24 Sep
8 years ago
b899d43a33
Allow base plugins to overwrite referencables made in other base plugins.
8 years ago
829345257c
Allow disabled nested tables to be scrollable
8 years ago
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
48c257b939
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
8 years ago
fab7549b42
Fix windows path issue in editor debug run.
...
- The problem was caused by spaces in the data directory
8 years ago
ee432690e6
Make it easier to place objects in the scene editor.
...
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
8 years ago
9764dbb8d2
Merge pull request #52 from OpenMW/master
...
Add OpenMW commits up to 2 Sep
8 years ago
316cf40f12
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
8 years ago
c0d53a2557
Fix CellRefs being teleported from interior to exterior cells.
8 years ago
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
8 years ago
3ae2fc17c6
Fix some issues with content file numbers in the editor.
...
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
8 years ago
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
8 years ago
91fd966146
Fix some issues detected by coverity for the editor.
8 years ago
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
8 years ago
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
8 years ago
7125775648
Change free axis rotation.
8 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
3e4ac0c662
Potential fix for context sensitive select mode issues.
8 years ago
2f6075329b
Clang warning fixes
8 years ago
101c3cc90d
Rotate around center of selection.
9 years ago
571969cd65
Scale from center of selection.
9 years ago
388917df89
Base editor rotate/scale commit.
9 years ago
a563a9d336
added missing Q_OBJECT
9 years ago
448c9d5a5b
Fix globals not being initialized with a valid type.
9 years ago
0963adb2f4
Fix pointer being deleted twice.
9 years ago
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
9 years ago
16d0580ce8
Fix struct/class mismatch.
9 years ago
1f32f1eef5
Add water texture.
9 years ago
9454f4f2e7
Use shared water geometry + state generation,
...
Fix water position and render bin,
Fix passed cell parameter being ignored
9 years ago
3904a24e6c
Add missing include.
9 years ago
Kyle Cooley
David Cernat
Marc Zinnschlag
PlutonicOverkill
scrawl
Capostrophic
AnyOldName3
Thunderforge
Rob Cutmore
Bret Curtis
Ewan Higgs
scrawl
FedeWar
MAtahualpa
Leon Krieg
Nikolay Kasyanov
Phillip Andrews
Allofich
MiroslavR