teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
19,407 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fa3baac0f3'
${ noResults }
Commit Graph

2779 Commits (fa3baac0f33aac3a066b3df4360ca2a9a02f27df)

Author SHA1 Message Date
David Cernat c10dd1b002 Merge pull request #188 from OpenMW/master 
Add OpenMW commits up to 24 Mar 2017
 8 years ago
Rob Cutmore 3714c2a0f2 Editor: add ID validator to pathgrid input 8 years ago
Rob Cutmore 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
Rob Cutmore 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
Rob Cutmore 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
Rob Cutmore 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
David Cernat 60037e4081 Merge pull request #185 from OpenMW/master 
Add OpenMW commits up to 14 Mar 2017
 8 years ago
scrawl 14225a42c6 Remove unused pointer to IncrementalCompileOperation 8 years ago
scrawl 5eff286c71 Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps. 8 years ago
scrawl 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
scrawl 80a0398f9d Load LandData into the LandObject to avoid threading conflicts when the same data is being loaded by two threads 8 years ago
scrawl 35d53acc65 Factor out terrain chunk loading/caching into a new resource manager 8 years ago
scrawl 9a3a64f0c4 Add resource manager for ESM::Land to allow data to be unloaded when no longer required 8 years ago
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
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. 9 years ago
David Cernat 436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 9 years ago
Marc Zinnschlag 2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 9 years ago
Aesylwinn 7125775648 Change free axis rotation. 9 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 9 years ago
Aesylwinn 3e4ac0c662 Potential fix for context sensitive select mode issues. 9 years ago
scrawl 2f6075329b Clang warning fixes 9 years ago
Aesylwinn 101c3cc90d Rotate around center of selection. 9 years ago
Aesylwinn 571969cd65 Scale from center of selection. 9 years ago
Aesylwinn 388917df89 Base editor rotate/scale commit. 9 years ago
Marc Zinnschlag a563a9d336 added missing Q_OBJECT 9 years ago
Aesylwinn 448c9d5a5b Fix globals not being initialized with a valid type. 9 years ago
Aesylwinn 0963adb2f4 Fix pointer being deleted twice. 9 years ago
David Cernat babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 9 years ago
Aesylwinn 16d0580ce8 Fix struct/class mismatch. 9 years ago
Aesylwinn 1f32f1eef5 Add water texture. 9 years ago
Aesylwinn 9454f4f2e7 Use shared water geometry + state generation, 
Fix water position and render bin,
Fix passed cell parameter being ignored
 9 years ago
Aesylwinn 3904a24e6c Add missing include. 9 years ago
Aesylwinn 5674e0da24 Render water in editor. 9 years ago