David Cernat
|
d9f5dfe65c
|
Merge pull request #138 from OpenMW/master
Add OpenMW commits up to 2 Feb 2017
|
8 years ago |
scrawl
|
625c5040ce
|
Fix build
|
8 years ago |
|
David Cernat
|
9f8f62b765
|
Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
|
8 years ago |
|
scrawl
|
960d4a96c3
|
Reduce the number of osg::Material state by setting the default state on the graph root
|
8 years ago |
|
David Cernat
|
973db7c78a
|
Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
|
8 years ago |
Marc Zinnschlag
|
34389e15cd
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
|
Marc Zinnschlag
|
827c78a4cd
|
added text column to ref id table (books)
|
8 years ago |
Leon Krieg
|
739cd5ba45
|
Fixed more spelling mistakes
|
8 years ago |
|
Leon Krieg
|
c7b4b2cdd7
|
Fixed multiple spelling mistakes
|
8 years ago |
|
David Cernat
|
7bbeed629d
|
Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
|
8 years ago |
|
scrawl
|
5297d7b5be
|
Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
|
8 years ago |
Nikolay Kasyanov
|
db69342b5d
|
[macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
|
8 years ago |
|
David Cernat
|
b028f0b51f
|
Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
|
8 years ago |
Phillip Andrews
|
c18fc113e5
|
Changed missing library dependencies to simple fix
|
8 years ago |
|
Phillip Andrews
|
aeaedbc57a
|
Moved install commands to target-specific cmakelists so that all configurations work.
|
8 years ago |
|
Phillip Andrews
|
59eba1dede
|
Changed tabs to spaces, oops
|
8 years ago |
|
Phillip Andrews
|
86b4673539
|
Removed math constants in openmw-cs, which are apparently not going to be used
|
8 years ago |
|
Phillip Andrews
|
1861302dbd
|
Include various libraries for Visual Studio environment
|
8 years ago |
|
David Cernat
|
cd798d5f23
|
Merge pull request #89 from OpenMW/master
Add OpenMW commits up to 30 Oct
|
8 years ago |
|
scrawl
|
e5cb7306c3
|
Merge pull request #1115 from Allofich/conversion
Fix narrowing conversion warning
|
8 years ago |
Allofich
|
68ed264f40
|
Fix narrowing conversion warning
|
8 years ago |
|
Allofich
|
125e94ef0e
|
Fix shadowing warnings
|
8 years ago |
|
David Cernat
|
47ebd24b4a
|
Merge pull request #79 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
|
8 years ago |
|
Allofich
|
ccacad51be
|
Fix shadowing warnings
|
8 years ago |
|
David Cernat
|
3136a12051
|
Resolve conflicts in pull request #75
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
|
8 years ago |
|
Allofich
|
1c54f54ab8
|
Fix shadowing warnings
|
8 years ago |
MiroslavR
|
53b006eccb
|
OpenMW-CS: Recognize special faction ID "FFFF" (no faction) during topic info verification (Fixes #3564)
|
8 years ago |
|
MiroslavR
|
8be8c7ca66
|
OpenMW-CS: Fix verification of "Not Local" info conditions (Bug #3564)
|
8 years ago |
|
scrawl
|
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 |
|
David Cernat
|
add1a5e5b2
|
Merge pull request #72 from OpenMW/master
Add OpenMW commits up to 30 Sep
|
8 years ago |
|
Marc Zinnschlag
|
e918474a94
|
Merge remote-tracking branch 'rcutmore/bug-3277'
|
8 years ago |
Rob Cutmore
|
8f47ed17df
|
Show nested tables only when they are editable
|
8 years ago |
|
Rob Cutmore
|
b59694c4f0
|
Set tooltip for read-only nested tables
|
8 years ago |
|
David Cernat
|
7e4543ffcb
|
Merge pull request #64 from OpenMW/master
Add OpenMW commits up to 24 Sep
|
8 years ago |
Aesylwinn
|
b899d43a33
|
Allow base plugins to overwrite referencables made in other base plugins.
|
8 years ago |
|
Rob Cutmore
|
829345257c
|
Allow disabled nested tables to be scrollable
|
8 years ago |
|
David Cernat
|
3b7693c719
|
Resolve conflicts in pull request #55
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
|
8 years ago |
|
Marc Zinnschlag
|
48c257b939
|
Merge remote-tracking branch 'aesylwinn/ContentNumberFix'
|
8 years ago |
|
Aesylwinn
|
fab7549b42
|
Fix windows path issue in editor debug run.
- The problem was caused by spaces in the data directory
|
8 years ago |
|
Aesylwinn
|
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 |
|
David Cernat
|
9764dbb8d2
|
Merge pull request #52 from OpenMW/master
Add OpenMW commits up to 2 Sep
|
8 years ago |
|
Marc Zinnschlag
|
316cf40f12
|
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
|
8 years ago |
|
Aesylwinn
|
c0d53a2557
|
Fix CellRefs being teleported from interior to exterior cells.
|
8 years ago |
|
Aesylwinn
|
b2ddd3c259
|
Initialize with correct content file number instead of correcting at save stage.
|
8 years ago |
|
Aesylwinn
|
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 |
|
David Cernat
|
4d2ca20445
|
Resolve conflicts in pull request #43
# Conflicts:
# README.md
|
8 years ago |
|
Aesylwinn
|
91fd966146
|
Fix some issues detected by coverity for the editor.
|
8 years ago |
|
David Cernat
|
436548413e
|
Resolve conflicts in pull request #39
# Conflicts:
# CMakeLists.txt
|
8 years ago |
|
Marc Zinnschlag
|
2fef8948f1
|
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
|
8 years ago |
|
Aesylwinn
|
7125775648
|
Change free axis rotation.
|
9 years ago |