Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Please ignore #1314

Closed
wants to merge 4,460 commits into from
Closed

Please ignore #1314

wants to merge 4,460 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jul 27, 2015

  1. improving consistency of subview layouts

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    a658efe View commit details
    Browse the repository at this point in the history

  2. fixed deleted button sensitivity state

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    2064a39 View commit details
    Browse the repository at this point in the history

  3. hooked up script subview buttons to bottom box (enables add and clone)

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    ecbdd7d View commit details
    Browse the repository at this point in the history

  4. display script errors in script subview

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    c5eec82 View commit details
    Browse the repository at this point in the history

  5. improved error reporting

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    3ea445c View commit details
    Browse the repository at this point in the history

  6. refactored mapping from message severity enum to string

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    092204b View commit details
    Browse the repository at this point in the history

  7. consider script warning settings for script subview

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    446ac99 View commit details
    Browse the repository at this point in the history

  8. improved error table layout

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    e86b8c9 View commit details
    Browse the repository at this point in the history

  9. made error table read only

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    6576ac3 View commit details
    Browse the repository at this point in the history

  10. jump to line in source text when clicking on an error in error table

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    757f7d8 View commit details
    Browse the repository at this point in the history

  11. consider column when jumping to error in source text

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    527ab1a View commit details
    Browse the repository at this point in the history

  12. do not try to jump to source location for errors that do not have a s… 

    …ource location
    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    9abc57d View commit details
    Browse the repository at this point in the history

  13. put script compilation in script subview behind a timer

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    7f89d36 View commit details
    Browse the repository at this point in the history

  14. make compilation delay configurable via a user setting

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    25bb298 View commit details
    Browse the repository at this point in the history

  15. do not allow editing of deleted scripts

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    833844f View commit details
    Browse the repository at this point in the history

  16. incorrect sBribe GMSTs for new omwgame files (Fixes OpenMW#2785)

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    1d722fc View commit details
    Browse the repository at this point in the history

  17. Fix definition conflict

    Koncord authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    386f545 View commit details
    Browse the repository at this point in the history

  18. updated credits file

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    73837e2 View commit details
    Browse the repository at this point in the history

  19. Fix building OpenCS with Qt 5.

    @rohit-n
    rohit-n authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    d037844 View commit details
    Browse the repository at this point in the history

  20. Proper sorting of columns with enum values

    @smbas
    smbas authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    ca67e4e View commit details
    Browse the repository at this point in the history

  21. IdTableProxyModel refreshes the filter when the source model data or … 

    …rows changed
    @smbas
    smbas authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    1041c3b View commit details
    Browse the repository at this point in the history

  22. Proper index creation for nested data

    @smbas
    smbas authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    77d5476 View commit details
    Browse the repository at this point in the history

  23. Fix a typo

    scrawl authored and cc9cii committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    6c8862e View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. Create a custom signal to inform about a row addition in IdTableProxy… 

    …Model
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    f24b293 View commit details
    Browse the repository at this point in the history

  2. Inform about a row addition after re-sorting in InfoTableProxyModel

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    9461baa View commit details
    Browse the repository at this point in the history

  3. Rework Table to use rowAdded() signal of a proxy model 

    Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    6a82ce0 View commit details
    Browse the repository at this point in the history

  4. Don't inform about a nested row addition in proxy models for top-leve… 

    …l tables
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    3280aad View commit details
    Browse the repository at this point in the history

  5. Add the configuration widget for extended commands 

    Conflicts:
	apps/opencs/CMakeLists.txt
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    b667500 View commit details
    Browse the repository at this point in the history

  6. Add the configuration widget to the bottom box 

    Conflicts:
	apps/opencs/view/world/tablebottombox.cpp
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    297373f View commit details
    Browse the repository at this point in the history

  7. Add the user setting for enabling the configuration of extended commands

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    832e910 View commit details
    Browse the repository at this point in the history

  8. Add the ability to configure extended commands for tables

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    94725f3 View commit details
    Browse the repository at this point in the history

  9. Rework widget layout of ExtendedCommandConfigurator

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    6c51e13 View commit details
    Browse the repository at this point in the history

  10. TableBottomBox adjusts its size according to the current widget size

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    24eb9bd View commit details
    Browse the repository at this point in the history

  11. ExtendedCommandConfigurator: disable the perform button when all tabl… 

    …es are unchecked
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    bf3891e View commit details
    Browse the repository at this point in the history

  12. The configuration panel gets a focus when opening

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    8eb677b View commit details
    Browse the repository at this point in the history

  13. ExtendedCommandConfigurator: the perform button takes the name of the… 

    … command that is executed
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    09d867c View commit details
    Browse the repository at this point in the history

  14. ExtendedCommandConfigurator: the perform button is now the default fo… 

    …r the widget
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    977f317 View commit details
    Browse the repository at this point in the history

  15. Fix build error

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    214a448 View commit details
    Browse the repository at this point in the history

  16. TableBottomBox: Creator/Configurator can be closed via Escape

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    194888e View commit details
    Browse the repository at this point in the history

  17. ExtendedCommandConfigurator: layout changes

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    be1cf2f View commit details
    Browse the repository at this point in the history

  18. Rewording of the user setting for extended configuration

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    34d8e5d View commit details
    Browse the repository at this point in the history

  19. Close the extended configurator when all respective records were remo… 

    …ved outside
    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    6033e67 View commit details
    Browse the repository at this point in the history

  20. Add edit locking to ExtendedCommandConfigurator

    @smbas
    smbas authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    9a93604 View commit details
    Browse the repository at this point in the history

  21. (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 

    Just give it a set of files, one file per argument, and it will make sure openmw can read them.
    @EmperorArthur
    EmperorArthur authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    f477611 View commit details
    Browse the repository at this point in the history

  22. allow keywords in quotes (Fixes OpenMW#2794)

    @zinnschlag
    zinnschlag authored and cc9cii committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    26d617d View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. Fix formatting issues after cherry-picking commit ab0b593

    cc9cii committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    7e7c028 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from cc9cii/master-cherry-pick 

    Merge master (cherry pick)
    @cc9cii
    cc9cii committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    2e6a8e1 View commit details
    Browse the repository at this point in the history

  3. Fix loading openmw-template.omwgame with debug builds (see: https://f… 

    …orum.openmw.org/viewtopic.php?f=7&p=34026#p34026).  Script::load() was failing with debug assertion fail (vector subscript out of range)
    cc9cii committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    7247da5 View commit details
    Browse the repository at this point in the history

  4. Remove duplicated config scanning (see: https://forum.openmw.org/view… 

    …topic.php?f=7&t=2922&p=32940#p32940)

* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
    cc9cii committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    5bef43a View commit details
    Browse the repository at this point in the history

  5. Fix for issue #6 (https://github.com/cc9cii/openmw/issues/6) where di… 

    …alogue subview for editing an NPC fails with an "invalid ID" exception.

* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
    cc9cii committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    870bb49 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2015

  1. Initial support for Land and LandTexture tables. Updates Features #936 … 

    …and #933.
    cc9cii committed Jul 31, 2015
    Configuration menu
    Copy the full SHA
    5538f82 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2015

  1. Update to keeping config comments (Feature OpenMW#2535) 

    -An attempt to fix Coverity-Scan warning (see: OpenMW#618 (comment))
- Unable to test until a PR can be submitted.
    cc9cii committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    da85b3a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from cc9cii/minor-enhancements 

    Minor enhancements
    @cc9cii
    cc9cii committed Aug 1, 2015
    Configuration menu
    Copy the full SHA
    8acc2f3 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2015

  1. Support MSVC 2015. Tested(*) with updated dependencies: 

    - Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763

(*) only tested compilation and startup of the each app
    cc9cii committed Aug 11, 2015
    Configuration menu
    Copy the full SHA
    b920e1b View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2015

  1. Fix compilation when using 1.9 Ogre branch (i.e. the previous change … 

    …on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch).
    cc9cii committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    bb250a2 View commit details
    Browse the repository at this point in the history

  2. Fix compiling with MSVC 2013 (typo mistake with the include file).

    cc9cii committed Aug 13, 2015
    Configuration menu
    Copy the full SHA
    2242920 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2015

  1. Proper index for Modified column in ModifyCommand

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    ec98a12 View commit details
    Browse the repository at this point in the history

  2. Inform about Modified status change when modifying a value of a model

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    4366bdb View commit details
    Browse the repository at this point in the history

  3. Restore Modified status of a record when adding/removing nested rows

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    bba3d6b View commit details
    Browse the repository at this point in the history

  4. Close EditWidget when a proper row removed

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    7a927ee View commit details
    Browse the repository at this point in the history

  5. Activate editing of nested table cells by a double click 

    Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    c0d714a View commit details
    Browse the repository at this point in the history

  6. Correct comparison of enum values in IdTableProxyModel

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    bc48ed9 View commit details
    Browse the repository at this point in the history

  7. Add appdata file for openmw and install it

    @nobrakal
    nobrakal authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    ce27f0c View commit details
    Browse the repository at this point in the history

  8. Rewrite of the description

    @nobrakal
    nobrakal authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    e9e057d View commit details
    Browse the repository at this point in the history

  9. allow use of IDs as function arguments, even if the ID matches a keyw… 

    …ord (Fixes OpenMW#2830)
    @zinnschlag
    zinnschlag authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    c157fef View commit details
    Browse the repository at this point in the history

  10. make non-editable fields in dialogue sub view selectable (Fixes OpenM… 

    …W#2818)
    @zinnschlag
    zinnschlag authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    c3a31d1 View commit details
    Browse the repository at this point in the history

  11. Added a help message to niftest 

    Now using the boost argument parser.
    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    7dc81c6 View commit details
    Browse the repository at this point in the history

  12. Have niftest handle directories as well 

    Note:  BSA files within the directory must be passed manually.
    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    8cecfe4 View commit details
    Browse the repository at this point in the history

  13. Updated niftest's help message

    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    16d163b View commit details
    Browse the repository at this point in the history

  14. niftest now scans BSA files in directories for nif errors 

    The program is explicit so the user knows exactly where the bad file is.
    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    8b48fe1 View commit details
    Browse the repository at this point in the history

  15. Cleaned up niftest's output 

    A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    28bc0cc View commit details
    Browse the repository at this point in the history

  16. Removed now unneeded script

    @EmperorArthur
    EmperorArthur authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    a7befc1 View commit details
    Browse the repository at this point in the history

  17. Add magic effect verifier

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    ef02bc6 View commit details
    Browse the repository at this point in the history

  18. Don't allow empty value of School field in Magic Effects table

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    11f5a92 View commit details
    Browse the repository at this point in the history

  19. Remove check for an empty Particle from Magic effects verifier

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    f0982c8 View commit details
    Browse the repository at this point in the history

  20. OpenMW#2730 and OpenMW#2725 

    Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
    @TarasKudryavtsev-WDFC
    TarasKudryavtsev-WDFC authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    0f2ea57 View commit details
    Browse the repository at this point in the history

  21. Remove additional instance of Display_YesNo (in cc9cii branch but not… 

    … in master)
    cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    2f372a7 View commit details
    Browse the repository at this point in the history

  22. Editor: fix magic effect magnitudes incorrectly labelled as Min/Max R… 

    …ange

Conflicts:
	apps/opencs/model/world/columns.hpp
    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    3456137 View commit details
    Browse the repository at this point in the history

  23. Editor: remove creature flag of unknown purpose from the UI

    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    1d2f4c8 View commit details
    Browse the repository at this point in the history

  24. Editor: fix a typo in ESM::Light flag mappings

    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    dae2588 View commit details
    Browse the repository at this point in the history

  25. Remove empty line at the beginning of files 

    git ls-files -z | xargs -0 sed -i '1{/^$/d}'
    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    f8f66bf View commit details
    Browse the repository at this point in the history

  26. Adjust OpenCS saving stages order to stop vanilla MW complaining abou… 

    …t missing records
    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    d1601fe View commit details
    Browse the repository at this point in the history

  27. Fix the ESM::LandTexture NAME being discarded on loading

    scrawl authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    402f1ff View commit details
    Browse the repository at this point in the history

  28. Sort tables by ID in the ascending order initially

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    2953675 View commit details
    Browse the repository at this point in the history

  29. ModifyCommand uses a proper name of a modified nested value

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    214f3e5 View commit details
    Browse the repository at this point in the history

  30. Remove enum names for AiWanderRepeat column

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    8c07d7f View commit details
    Browse the repository at this point in the history

  31. Columns with Display_Boolean use Combobox editor even for non-boolean… 

    … values
    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    68013bd View commit details
    Browse the repository at this point in the history

  32. Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    3a41fe5 View commit details
    Browse the repository at this point in the history

  33. Show race only when mesh type is Skin (in BodyParts table)

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    b53a773 View commit details
    Browse the repository at this point in the history

  34. Inform about State change (not a whole row) when modifying a table value

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    859ba93 View commit details
    Browse the repository at this point in the history

  35. Add missing includes to columnimp.hpp

    @smbas
    smbas authored and cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    ca14d6a View commit details
    Browse the repository at this point in the history

  36. Merge pull request #9 from cc9cii/master-cherry-pick-2 

    Master cherry pick 2
    @cc9cii
    cc9cii committed Sep 7, 2015
    Configuration menu
    Copy the full SHA
    904f987 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2015

  1. Increment save file version and mark it as used, will be used in next… 

    … commit

(cherry picked from commit 4eaaa5e)
    scrawl authored and cc9cii committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    843afc5 View commit details
    Browse the repository at this point in the history

  2. Savegame loading optimization 

    (cherry picked from commit 4637750)
    scrawl authored and cc9cii committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    b9ba106 View commit details
    Browse the repository at this point in the history

  3. Use the format field instead of version field 

    (cherry picked from commit a081d40)
    scrawl authored and cc9cii committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    05fd4e1 View commit details
    Browse the repository at this point in the history

  4. Refuse loading save games of unknown format 

    (cherry picked from commit 20d03c7)
    scrawl authored and cc9cii committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    65bd5d8 View commit details
    Browse the repository at this point in the history

  5. Use the correct format specifier for ess-imported savegames 

    (cherry picked from commit 2065e0f)
    scrawl authored and cc9cii committed Oct 25, 2015
    Configuration menu
    Copy the full SHA
    52dfc0e View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2015

  1. replaced State_Compiling (not requried anymore) with State_Merging 

    (cherry picked from commit 6a9218e)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    6fb658d View commit details
    Browse the repository at this point in the history

  2. added UI for merge tool (merge tool itself is still missing) 

    (cherry picked from commit b83f944)

Conflicts:
	apps/opencs/editor.cpp
	apps/opencs/editor.hpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    ef1e016 View commit details
    Browse the repository at this point in the history

  3. improved adjuster widget problem reporting 

    (cherry picked from commit 4fd3097)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    a5a0990 View commit details
    Browse the repository at this point in the history

  4. disable merge menu item when a merge is already in progress 

    (cherry picked from commit 708cacd)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c2ed475 View commit details
    Browse the repository at this point in the history

  5. added merge operation (doesn't do anything yet) 

    (cherry picked from commit 904ad94)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    e4381c3 View commit details
    Browse the repository at this point in the history

  6. inheriting Merge from QWidget instead of QDialog, because QDialog is … 

    …bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)

(cherry picked from commit e237739)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    9423603 View commit details
    Browse the repository at this point in the history

  7. forgot to connect merge operation signals 

    (cherry picked from commit d8655f2)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    0b8e04d View commit details
    Browse the repository at this point in the history

  8. create merged document and open a view for it (document is still empt… 

    …y at this point)

(cherry picked from commit 1b663f0)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    3eef192 View commit details
    Browse the repository at this point in the history

  9. copy meta data from game file when merging 

    (cherry picked from commit 47dd950)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    55dfe48 View commit details
    Browse the repository at this point in the history

  10. merge id collections 

    (cherry picked from commit 3902513)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    973c65b View commit details
    Browse the repository at this point in the history

  11. flag newly merged documents as dirty (triggering an 'are you sure' di… 

    …alogue when closing without saving first)

(cherry picked from commit c92898a)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    024a540 View commit details
    Browse the repository at this point in the history

  12. added info tables and pathgrid table to merge operation 

    (cherry picked from commit 1030731)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    98cac62 View commit details
    Browse the repository at this point in the history

  13. made merge operation more fluent 

    (cherry picked from commit 16dda28)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    e33314a View commit details
    Browse the repository at this point in the history

  14. simplifying merge stage 

    (cherry picked from commit 40753aa)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    72aa998 View commit details
    Browse the repository at this point in the history

  15. silenced a warning 

    (cherry picked from commit 9cf793c)

Conflicts:
	apps/opencs/model/doc/document.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    81188a3 View commit details
    Browse the repository at this point in the history

  16. merge referenceables table 

    (cherry picked from commit f95950e)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    9230c62 View commit details
    Browse the repository at this point in the history

  17. fixed record state issues after merge 

    (cherry picked from commit 845cafd)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    62daeca View commit details
    Browse the repository at this point in the history

  18. merge references tables 

    (cherry picked from commit a97a632)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    73ab89b View commit details
    Browse the repository at this point in the history

  19. fixed merge stage order; added proper initialisation 

    (cherry picked from commit b7983d0)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    e5038cb View commit details
    Browse the repository at this point in the history

  20. merge land texture tables 

    (cherry picked from commit 890bbb6)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    a2d4957 View commit details
    Browse the repository at this point in the history

  21. added copy constructor and assignment operator for Land record struct 

    (cherry picked from commit b064193)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    35c4af9 View commit details
    Browse the repository at this point in the history

  22. additional safety check for land texture listing merge stage 

    (cherry picked from commit 69045d7)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    8cb1f4f View commit details
    Browse the repository at this point in the history

  23. made return type of ESMTerrain::Storage::getLand const 

    (cherry picked from commit febf611)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    44020df View commit details
    Browse the repository at this point in the history

  24. more const-ness fixes

    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    4f24c6a View commit details
    Browse the repository at this point in the history

  25. refactored loading of land data 

    (cherry picked from commit 69b9ead)

Conflicts:
	apps/openmw/mwworld/scene.cpp
	components/esmterrain/storage.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c4b34a0 View commit details
    Browse the repository at this point in the history

  26. removed indirection in OpenMW-CS land record 

    (cherry picked from commit 85f6bb8)

Conflicts:
	apps/opencs/view/render/cell.cpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    ce34daa View commit details
    Browse the repository at this point in the history

  27. merge land tables 

    (cherry picked from commit a8dc1c1)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    2595236 View commit details
    Browse the repository at this point in the history

  28. fixed a texture indexing bug (only affects the editor) 

    (cherry picked from commit 73f6efd)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    1784701 View commit details
    Browse the repository at this point in the history

  29. handle missing land texture records properly during merge 

    (cherry picked from commit 09ec60f)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    dcf1f15 View commit details
    Browse the repository at this point in the history

  30. various minor fixes 

    (cherry picked from commit 584a7a6)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    4aa6d7d View commit details
    Browse the repository at this point in the history

  31. fixed an indexing error 

    (cherry picked from commit 23fde87)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    453c3ee View commit details
    Browse the repository at this point in the history

  32. disable on-demand loading of land data (for now, maybe) 

    (cherry picked from commit 5be176e)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    5031d1f View commit details
    Browse the repository at this point in the history

  33. adjust FindMyGUI.cmake to correctly handle REQUIRED and QUIETLY 

    (cherry picked from commit b68f64e)
    @swick
    swick authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    03ee1ec View commit details
    Browse the repository at this point in the history

  34. Add some comments to ESM::Land 

    (cherry picked from commit 5252dbc)

Conflicts:
	components/esm/loadland.hpp
    scrawl authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c0f21bf View commit details
    Browse the repository at this point in the history

  35. Add CONTRIBUTING.md 

    (cherry picked from commit 6c6fc66)
    scrawl authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c40e68c View commit details
    Browse the repository at this point in the history

  36. CONTRIBUTING.md: clarify "if applicable" 

    (cherry picked from commit 5fde914)
    scrawl authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    7c347a5 View commit details
    Browse the repository at this point in the history

  37. Ensure ColumnId names are unique. Filter parser calls Columns::getId(… 

    …) which implies that these should be unique.

(cherry picked from commit 258b2ba)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    496cdcb View commit details
    Browse the repository at this point in the history

  38. Rationalise the use of ColumnIds 

    (cherry picked from commit c4a900c)

Conflicts:
	apps/opencs/model/world/refidcollection.cpp
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    41f2ffd View commit details
    Browse the repository at this point in the history

  39. Add missing fields for editing creatures. 

    - Should resolve resolve bugs OpenMW#2878 (level), OpenMW#2901 (gold) and OpenMW#2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)

(cherry picked from commit 5a5e1a3)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    f7eb502 View commit details
    Browse the repository at this point in the history

  40. Remove AI flag from the UI and instead auto-detect whether to save AI… 

    …DT records. Should resolve bug OpenMW#2879.

(cherry picked from commit 45aee1b)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    2f76a15 View commit details
    Browse the repository at this point in the history

  41. Set default creature scale to 1. Partially resolves bug OpenMW#2880. … 

    …(no creature verifier yet)

(cherry picked from commit 192f01e)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    148ccb7 View commit details
    Browse the repository at this point in the history

  42. Fix typo. 

    (cherry picked from commit 1365b8e)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    ae1439f View commit details
    Browse the repository at this point in the history

  43. replaced context-sensitive implementation of allowing digits at the b… 

    …eginning of names with a more general implementation (Fixes OpenMW#1730)

(cherry picked from commit 4d94f38)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    a229411 View commit details
    Browse the repository at this point in the history

  44. Fix tab indentations in apps/ and components/ 

    (cherry picked from commit a47617c)

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwphysics/physicssystem.cpp
    scrawl authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    fcb9068 View commit details
    Browse the repository at this point in the history

  45. Add travis-ci script to detect tab characters in the code 

    (cherry picked from commit ab97a90)
    scrawl authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    9179782 View commit details
    Browse the repository at this point in the history

  46. updated credits file 

    (cherry picked from commit 56163dc)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    46c6092 View commit details
    Browse the repository at this point in the history

  47. removed some left-over signal slot stuff that shouldn't have been the… 

    …re in the first place

(cherry picked from commit b3b4fb3)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    6f294d0 View commit details
    Browse the repository at this point in the history

  48. more cleanup 

    (cherry picked from commit 659b87b)

Conflicts:
	apps/opencs/view/doc/view.hpp
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    14708e1 View commit details
    Browse the repository at this point in the history

  49. fixed local variable caching issue in automatic error checking (Fixes O… 

    …penMW#2927)

(cherry picked from commit 7bef97b)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    69e6328 View commit details
    Browse the repository at this point in the history

  50. scripts: recognize '+' also as a unary operator 

    it fixes the armor sorter in "Blades safe house.esp"

(cherry picked from commit dace7ab)
    @zelurker
    zelurker authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    890405b View commit details
    Browse the repository at this point in the history

  51. removed a redundant else and made unary + work also in the console 

    (cherry picked from commit ae54f34)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c5235ea View commit details
    Browse the repository at this point in the history

  52. adjusted a workaround for names starting with digits that interfered … 

    …with some numerical expressions written without spaces

(cherry picked from commit 435e523)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    4677560 View commit details
    Browse the repository at this point in the history

  53. Added StartScriptCreator class with redefined getErrors method. 

    (cherry picked from commit 3f27c85)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    cb6198a View commit details
    Browse the repository at this point in the history

  54. Fix namespace, add file to CMakeLists.txt 

    (cherry picked from commit e672880)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    b0018aa View commit details
    Browse the repository at this point in the history

  55. add getIdValidatorResult method to GenericCreator, for use in subclass 

    StartScriptCreator

(cherry picked from commit 903cd33)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    7f46bc1 View commit details
    Browse the repository at this point in the history

  56. Add StartScriptCreator to a factory manager. 

    (cherry picked from commit ecce3a1)

Conflicts:
	apps/opencs/view/world/subviews.cpp
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    c34d8c2 View commit details
    Browse the repository at this point in the history

  57. updated credits file 

    (cherry picked from commit 64902bf)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    8fffbb3 View commit details
    Browse the repository at this point in the history

  58. Further rationalise the use of ColumnIds 

    - Address Zini's review comments as per OpenMW#755

(cherry picked from commit 998348e)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    9cc046c View commit details
    Browse the repository at this point in the history

  59. Fix AiWander sub-table editing. Should resolve bugs OpenMW#2888 and O… 

    …penMW#2930.

(cherry picked from commit 3bbcf6a)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    b3daa7d View commit details
    Browse the repository at this point in the history

  60. Disable toolbar context menu. Should resolve bug OpenMW#2953. 

    (cherry picked from commit 64821b0)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    71077fd View commit details
    Browse the repository at this point in the history

  61. deal with script execution from within a script (Fixes OpenMW#2964) 

    (cherry picked from commit 8eb6d33)
    @zinnschlag
    zinnschlag authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    aa31704 View commit details
    Browse the repository at this point in the history

  62. Implemented line and col calculations in scriptsubview 

    (cherry picked from commit e7a3f05)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    ba9190e View commit details
    Browse the repository at this point in the history

  63. Stream error handling, and other minor changes. 

    (cherry picked from commit 4ca7b26)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    f44d7e9 View commit details
    Browse the repository at this point in the history

  64. If table dont use any filter, filter update now dont cause a reapply … 

    …of empty filter

(cherry picked from commit 33e12a9)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    437cabf View commit details
    Browse the repository at this point in the history

  65. Fixed filter reapplication on Description column change and on State 

    column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.

(cherry picked from commit eae36f8)
    @artemutin
    artemutin authored and cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    91c4afe View commit details
    Browse the repository at this point in the history

  66. Fix editing ingredient effects sub-table. Should resolve bug OpenMW#2978 

    .

(cherry picked from commit 9f0e059)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    30de5c1 View commit details
    Browse the repository at this point in the history

  67. Fix skills and attributes being possible to add to irrelevant effects… 

    …. Should resolve bug OpenMW#2980.

(cherry picked from commit 1a64b40)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    bb1a959 View commit details
    Browse the repository at this point in the history

  68. Fix issue where mandatory effects field was allowed to be empty (and … 

    …vice versa)

(cherry picked from commit 972193c)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    b595f26 View commit details
    Browse the repository at this point in the history

  69. Disable context menu for fixed size sub-tables. Should resolve bug Op… 

    …enMW#2932.

(cherry picked from commit 80869d9)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    f08680e View commit details
    Browse the repository at this point in the history

  70. Re-add mistakenly removed line and fix a silly typo. 

    (cherry picked from commit 77471d1)
    cc9cii committed Nov 1, 2015
    Configuration menu
    Copy the full SHA
    0ec4af4 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2015

  1. Move TableEditModes enum inside a class scope. 

    (cherry picked from commit 107ccd8)

Conflicts:
	apps/opencs/model/world/refidadapterimp.cpp
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    245357c View commit details
    Browse the repository at this point in the history

  2. Fix saving when only topic info was modified (topic itself unchanged) 

    (cherry picked from commit 78c735a)
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    894f3a9 View commit details
    Browse the repository at this point in the history

  3. Rename a variable to make it less confusing. 

    (cherry picked from commit 7c007d9)
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    26195dc View commit details
    Browse the repository at this point in the history

  4. Add a check for scale value of 0. Should resolve bug OpenMW#2880. 

    (cherry picked from commit 819fecd)
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    a19a1da View commit details
    Browse the repository at this point in the history

  5. Fix some sub-tables becoming uneditable since commit 80869d 

    (cherry picked from commit 4af4695)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    6d38d97 View commit details
    Browse the repository at this point in the history

  6. Fix include file issue. 

    (cherry picked from commit 7f477e2)
    cc9cii committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    12a8692 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2015

  1. Merge pull request #10 from cc9cii/master-cherry-pick-3 

    Merge master (cherry pick 3)
    @cc9cii
    cc9cii committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    9f4ecc2 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2015

  1. Merge branch 'cc9cii' into jump-to-modified 

    Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
	apps/opencs/view/world/tablesubview.cpp
    cc9cii committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    fb3015c View commit details
    Browse the repository at this point in the history

  2. Resolve merge issues and add back user preference setting for auto se… 

    …lecting a modified record.

(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
    cc9cii committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    007c733 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #11 from cc9cii/jump-to-modified 

    Feature OpenMW#2554
    @cc9cii
    cc9cii committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    5b1373f View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2015

  1. Merge branch 'pathgrid-edit' into Feature-1278 

    Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
    cc9cii committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    f7598a6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'cc9cii' into Feature-1278 

    Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp
    cc9cii committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    9716b67 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #12 from cc9cii/Feature-1278 

    Feature #1278 - part 1
    @cc9cii
    cc9cii committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    c7c0023 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2015

  1. Compiler: remove unused mNameStartingWithDigit 

    (cherry picked from commit f7d0d06)
    scrawl authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    368dd9b View commit details
    Browse the repository at this point in the history

  2. fixed an interference with script warning mode and error downgrading (F… 

    …ixes OpenMW#2990)

(cherry picked from commit b61b732)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    70cb6f0 View commit details
    Browse the repository at this point in the history

  3. Add NAME and DELE handling to ESM records. 

    Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.

(cherry picked from commit 926c825)

Conflicts:
	components/esm/loadstat.cpp
	components/esm/loadstat.hpp
	components/esm/util.hpp
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    e9a8eac View commit details
    Browse the repository at this point in the history

  4. Add NAME and DELE handling to ESM records. 

    Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.

(cherry picked from commit 9ac20a3)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    44c36a0 View commit details
    Browse the repository at this point in the history

  5. Add NAME and DELE handling to Script record 

    (cherry picked from commit d2c1564)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    1b21d1b View commit details
    Browse the repository at this point in the history

  6. Change DELE sub-record value to 0 (4 bytes) 

    (cherry picked from commit 19ac4e9)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    93736e9 View commit details
    Browse the repository at this point in the history

  7. Add NAME and DELE handling to Dialogue record 

    (cherry picked from commit 0b53718)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    d89de1b View commit details
    Browse the repository at this point in the history

  8. Add DELE handling to Info record 

    (cherry picked from commit 847614c)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    8c77caf View commit details
    Browse the repository at this point in the history

  9. Add NAME and DELE handling to Cell record 

    (cherry picked from commit b667338)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    7dc0c91 View commit details
    Browse the repository at this point in the history

  10. Add NAME handling to Race record 

    (cherry picked from commit 8c3654a)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    4f1601f View commit details
    Browse the repository at this point in the history

  11. Remove redundant code 

    (cherry picked from commit 30b42bf)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    1aa1336 View commit details
    Browse the repository at this point in the history

  12. Add NAME and DELE handling to Global record 

    (cherry picked from commit 09a3358)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    711d787 View commit details
    Browse the repository at this point in the history

  13. Add NAME handling to GameSetting record 

    (cherry picked from commit b2f3ccb)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    c4fd4be View commit details
    Browse the repository at this point in the history

  14. Remove explicit record ID in load/read methods of MWWorld::Store 

    (cherry picked from commit 89e44c8)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    e0d5208 View commit details
    Browse the repository at this point in the history

  15. Remove NAME handling from MWWorld::ESMStore 

    (cherry picked from commit 9301bc1)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    2564eb9 View commit details
    Browse the repository at this point in the history

  16. Remove NAME handling from MWWorld::Globals 

    (cherry picked from commit 897a52c)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    f8b0cfc View commit details
    Browse the repository at this point in the history

  17. Convert IDs of loaded records to lower case in MWWorld::Store 

    (cherry picked from commit 00bf87b)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    a46ea70 View commit details
    Browse the repository at this point in the history

  18. Letter case fix for MWWorld::Globals 

    (cherry picked from commit 2072358)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    19acd1f View commit details
    Browse the repository at this point in the history

  19. Set Deleted flag to false when initializing ESM records 

    (cherry picked from commit 7ecb54a)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    80074f9 View commit details
    Browse the repository at this point in the history

  20. Some fixes for ESM Dialogues and Infos 

    (cherry picked from commit e0983c8)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    25a8cda View commit details
    Browse the repository at this point in the history

  21. Add removing of deleted Infos to Dialogue::clearDeletedInfos() 

    (cherry picked from commit adec0cb)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    2448aa0 View commit details
    Browse the repository at this point in the history

  22. Load/read methods in MWWorld::Store return a pair (record ID, deleted… 

    … flag)

(cherry picked from commit c266315)

Conflicts:
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/store.hpp
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    377d606 View commit details
    Browse the repository at this point in the history

  23. Remove DELE and NAME handling from RefIdCollection and RefIdData 

    (cherry picked from commit 42f9136)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    639e6e1 View commit details
    Browse the repository at this point in the history

  24. Remove NAME and DELE handling from IdCollection 

    (cherry picked from commit 74a055f)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    d518d70 View commit details
    Browse the repository at this point in the history

  25. Move ID loading into a separate method for Dialogue and DialInfo records 

    (cherry picked from commit c8c79dc)

Conflicts:
	apps/openmw/mwworld/store.cpp
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    72152d8 View commit details
    Browse the repository at this point in the history

  26. Remove INAM handling from InfoCollection 

    (cherry picked from commit 71e5fc7)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    bd695fe View commit details
    Browse the repository at this point in the history

  27. Add NAME handling to DebugProfile and Filter records 

    (cherry picked from commit b55a499)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    82e1b05 View commit details
    Browse the repository at this point in the history

  28. Rework RefIdData code. Update the index map when a new record is loaded 

    (cherry picked from commit 5e623a2)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    0979d88 View commit details
    Browse the repository at this point in the history

  29. Return a correct index for a loaded record that was deleted 

    (cherry picked from commit a1389b8)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    9503104 View commit details
    Browse the repository at this point in the history

  30. Move DELE handling to CellRef record 

    (cherry picked from commit e8a9567)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    3686c1e View commit details
    Browse the repository at this point in the history

  31. Handle deleted records in RefCollection 

    (cherry picked from commit 3ba73f5)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    4e19969 View commit details
    Browse the repository at this point in the history

  32. Refine DELE handling in ESM records. Add position-independent DELE se… 

    …arch

(cherry picked from commit ad353e6)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    8b7b3d2 View commit details
    Browse the repository at this point in the history

  33. More ESM records have DELE handling. 

    Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter

(cherry picked from commit e65ff72)

Conflicts:
	components/esm/loadland.cpp
	components/esm/loadland.hpp
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    b5c958c View commit details
    Browse the repository at this point in the history

  34. Some refactoring. Remove unused code 

    (cherry picked from commit 5fd48ef)

Conflicts:
	apps/openmw/mwworld/store.cpp
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    696f7a9 View commit details
    Browse the repository at this point in the history

  35. Add a separate method to check whether a record is deleted or not for… 

    … IdCollection

(cherry picked from commit a4d3e59)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    9a80373 View commit details
    Browse the repository at this point in the history

  36. Delete infos of deleted dialogue when loading a content file 

    (cherry picked from commit e04e32b)
    @smbas
    smbas authored and cc9cii committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    a120bb2 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2015

  1. Implement saving of deleted records 

    (cherry picked from commit 8e6a7be)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0277a4e View commit details
    Browse the repository at this point in the history

  2. Rework EsmTool code. Remove explicit NAME handling 

    (cherry picked from commit ede4bfc)

Conflicts:
	apps/esmtool/record.cpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    459fe3d View commit details
    Browse the repository at this point in the history

  3. Rework ESS importer code. Remove explicit NAME handling for ESM records 

    (cherry picked from commit 6b21da7)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    a3d48fd View commit details
    Browse the repository at this point in the history

  4. Remove <cstdint> include file from loaddial.cpp 

    (cherry picked from commit f574574)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    d12f784 View commit details
    Browse the repository at this point in the history

  5. Fix build errors & warnings 

    (cherry picked from commit 1e81822)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    7013ba7 View commit details
    Browse the repository at this point in the history

  6. Make deleted flag a parameter of load/save methods (instead of a reco… 

    …rd member) in ESM records

(cherry picked from commit 4a16eba)

Conflicts:
	components/esm/loadland.cpp
	components/esm/loadland.hpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    82363bf View commit details
    Browse the repository at this point in the history

  7. Load/read methods (for ESM records) accept a deleted flag in OpenMW 

    (cherry picked from commit 67c8f95)

Conflicts:
	apps/openmw/mwworld/store.cpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0c002dd View commit details
    Browse the repository at this point in the history

  8. Load methods (for ESM records) accept a deleted flag in OpenCS 

    (cherry picked from commit 13bb6be)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    f4587e4 View commit details
    Browse the repository at this point in the history

  9. Load methods (for ESM records) accept a deleted flag in ESMTool 

    (cherry picked from commit 8243fb2)

Conflicts:
	apps/esmtool/record.cpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0c4dd48 View commit details
    Browse the repository at this point in the history

  10. Load methods (for ESM records) accept a deleted flag in ESSImporter 

    (cherry picked from commit 0c6ab6c)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    38e99c9 View commit details
    Browse the repository at this point in the history

  11. Remove unused includes 

    (cherry picked from commit daaff12)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    2abdeef View commit details
    Browse the repository at this point in the history

  12. Fix missing break in switch statement 

    (cherry picked from commit 9a8ca81)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    3821bff View commit details
    Browse the repository at this point in the history

  13. Make saving of deleted ESM records more consistent 

    (cherry picked from commit f9b0b7e)
    @smbas
    smbas authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    d789d93 View commit details
    Browse the repository at this point in the history

  14. Move common subrecord definitions (NAME, DELE) to defs.hpp 

    (cherry picked from commit fc8e408)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    41ee50c View commit details
    Browse the repository at this point in the history

  15. esmtool fix 

    (cherry picked from commit 9116c70)

Conflicts:
	apps/esmtool/record.cpp
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    25bb8a5 View commit details
    Browse the repository at this point in the history

  16. Delete empty test 

    (cherry picked from commit d0d8c2e)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    f9e12d6 View commit details
    Browse the repository at this point in the history

  17. Tests: add dialogue_merging_test (requires some data files) 

    (cherry picked from commit 38c155c)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    c221be7 View commit details
    Browse the repository at this point in the history

  18. Tests: add content_diagnostics_test (requires some data files) 

    (cherry picked from commit 771193b)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    c3031da View commit details
    Browse the repository at this point in the history

  19. Tests: add record deletion test 

    (cherry picked from commit 1e817a9)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    d3ada38 View commit details
    Browse the repository at this point in the history

  20. Tests: add record overwrite test 

    (cherry picked from commit f91aae2)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0d9ffe8 View commit details
    Browse the repository at this point in the history

  21. Adjust tests to work with esm_rewrite branch. 

    (cherry picked from commit aae1aa3)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    33c0db1 View commit details
    Browse the repository at this point in the history

  22. Resolve merge issues.

    cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    1334091 View commit details
    Browse the repository at this point in the history

  23. Add FFMPEG to include path for OpenMW 

    I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
(cherry picked from commit d2a4175)
    @ananace
    ananace authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    940e982 View commit details
    Browse the repository at this point in the history

  24. Remove unused SOUND_INPUT_INCLUDES cmake variable. 

    (cherry picked from commit 0220e82)

Conflicts:
	apps/openmw/CMakeLists.txt
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    d3caeaf View commit details
    Browse the repository at this point in the history

  25. Fix double writing of Dialogue NAME in OpenCS 

    (cherry picked from commit af49235)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    ebf9ffd View commit details
    Browse the repository at this point in the history

  26. Ignore Creature INDX subrecords 

    Found in some .ess files, not sure what they mean.

(cherry picked from commit 0bdfd1b)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0eca29e View commit details
    Browse the repository at this point in the history

  27. adjusted startup warning message for recent improvements regarding lo… 

    …ading/saving

(cherry picked from commit e0e9e7f)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    30b28bf View commit details
    Browse the repository at this point in the history

  28. Removed validator for filenames in OpenMW-CS (Fixes OpenMW#2918) 

    (cherry picked from commit b74b274)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    0366a05 View commit details
    Browse the repository at this point in the history

  29. hide script error list when there are no errors (Fixes OpenMW#2867) 

    (cherry picked from commit 1093a53)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    2c5f0bf View commit details
    Browse the repository at this point in the history

  30. do not adjust error panel height if panal was already open 

    (cherry picked from commit 26640d1)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    8da783d View commit details
    Browse the repository at this point in the history

  31. remember script error panel height per scriptsubview 

    (cherry picked from commit f5c61ee)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    8c4d414 View commit details
    Browse the repository at this point in the history

  32. make initial size of script error panel configurable (Fixes OpenMW#2996) 

    (cherry picked from commit 99500f4)
    @zinnschlag
    zinnschlag authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    ec00bd2 View commit details
    Browse the repository at this point in the history

  33. StringUtils: use the locale-unaware tolower function 

    There is no change in behaviour since we were using the C locale.

The locale-aware tolower is much slower than the locale-unaware one. At least on Linux/GCC it calls dynamic_cast's, and is overall slower by an order of magnitude.

(cherry picked from commit 27e6692)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    a1939ae View commit details
    Browse the repository at this point in the history

  34. Not found Land Textures are no longer a fatal error (Bug OpenMW#3037) 

    Log warning message and show the default texture when encountering invalid ESM::LandTexture references.

(cherry picked from commit 35fa1f5)
    scrawl authored and cc9cii committed Dec 5, 2015
    Configuration menu
    Copy the full SHA
    3c02703 View commit details
    Browse the repository at this point in the history