Commit Graph

2716 Commits (coverity_scan)

Author SHA1 Message Date
David Cernat 0d6636018f Merge pull request #166 from OpenMW/master
Add OpenMW commits up to 23 Feb 2017
8 years ago
FedeWar e9076088ca Another tab fix 8 years ago
FedeWar 4e7f7cf84f Fixed tabs 8 years ago
FedeWar 370c12e78a Verification results are ordered by Type in alphabetical order. 8 years ago
David Cernat cdffbc05f7 Merge pull request #159 from OpenMW/master
Add OpenMW commits up to 19 Feb 2017
8 years ago
MAtahualpa 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
David Cernat fd4827b3a7 Merge pull request #157 from OpenMW/master
Add OpenMW commits up to 18 Feb 2017, part 2
8 years ago
MAtahualpa 520e82ed4f Fix for commit "affc0eb..." in PR 1216 (fixes #3756)
Fixed use of tab character.
8 years ago
MAtahualpa 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
David Cernat e0bc557aa4 Merge pull request #154 from OpenMW/master
Add OpenMW commits up to 17 Feb 2017
8 years ago
MAtahualpa 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
David Cernat c32c004516 Merge pull request #151 from OpenMW/master
Add OpenMW commits up to 16 Feb 2017
8 years ago
MAtahualpa 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
MAtahualpa 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
Marc Zinnschlag e46fb1770c Merge remote-tracking branch 'matahualpa/openmw-cs_booktype' 8 years ago
MAtahualpa 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
MAtahualpa 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
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 8 years ago
David Cernat a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
8 years ago
MAtahualpa c5dcfe0794 Update refidadapterimp.cpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
MAtahualpa 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
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