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

Conversation

cc9cii
Copy link

@cc9cii cc9cii commented Dec 5, 2015

Sorry about this, submitted to wrong repo.

zinnschlag and others added 30 commits July 27, 2015 15:20
@zinnschlag @cc9cii
improving consistency of subview layouts
a658efe
@zinnschlag @cc9cii
fixed deleted button sensitivity state
2064a39
@zinnschlag @cc9cii
hooked up script subview buttons to bottom box (enables add and clone)
ecbdd7d
@zinnschlag @cc9cii
display script errors in script subview
c5eec82
@zinnschlag @cc9cii
improved error reporting
3ea445c
@zinnschlag @cc9cii
refactored mapping from message severity enum to string
092204b
@zinnschlag @cc9cii
consider script warning settings for script subview
446ac99
@zinnschlag @cc9cii
improved error table layout
e86b8c9
@zinnschlag @cc9cii
made error table read only
6576ac3
@zinnschlag @cc9cii
jump to line in source text when clicking on an error in error table
757f7d8
@zinnschlag @cc9cii
consider column when jumping to error in source text
527ab1a
@zinnschlag @cc9cii
do not try to jump to source location for errors that do not have a s…
9abc57d 
…ource location
@zinnschlag @cc9cii
put script compilation in script subview behind a timer
7f89d36
@zinnschlag @cc9cii
make compilation delay configurable via a user setting
25bb298
@zinnschlag @cc9cii
do not allow editing of deleted scripts
833844f
@zinnschlag @cc9cii
incorrect sBribe GMSTs for new omwgame files (Fixes OpenMW#2785)
1d722fc
@cc9cii
Fix definition conflict
386f545
@zinnschlag @cc9cii
updated credits file
73837e2
@rohit-n @cc9cii
Fix building OpenCS with Qt 5.
d037844
@smbas @cc9cii
Proper sorting of columns with enum values
ca67e4e
@smbas @cc9cii
IdTableProxyModel refreshes the filter when the source model data or …
1041c3b 
…rows changed
@smbas @cc9cii
Proper index creation for nested data
77d5476
@cc9cii
Fix a typo
6c8862e
@smbas @cc9cii
Create a custom signal to inform about a row addition in IdTableProxy…
f24b293 
…Model
@smbas @cc9cii
Inform about a row addition after re-sorting in InfoTableProxyModel
9461baa
@smbas @cc9cii
Rework Table to use rowAdded() signal of a proxy model
6a82ce0 
Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
@smbas @cc9cii
Don't inform about a nested row addition in proxy models for top-leve…
3280aad 
…l tables
@smbas @cc9cii
Add the configuration widget for extended commands
b667500 
Conflicts:
	apps/opencs/CMakeLists.txt
@smbas @cc9cii
Add the configuration widget to the bottom box
297373f 
Conflicts:
	apps/opencs/view/world/tablebottombox.cpp
@smbas @cc9cii
Add the user setting for enabling the configuration of extended commands
832e910
smbas and others added 27 commits December 5, 2015 11:22
@smbas @cc9cii
Load methods (for ESM records) accept a deleted flag in OpenCS
f4587e4 
(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 @cc9cii
Load methods (for ESM records) accept a deleted flag in ESMTool
0c4dd48 
(cherry picked from commit 8243fb2)

Conflicts:
	apps/esmtool/record.cpp
@smbas @cc9cii
Load methods (for ESM records) accept a deleted flag in ESSImporter
38e99c9 
(cherry picked from commit 0c6ab6c)
@smbas @cc9cii
Remove unused includes
2abdeef 
(cherry picked from commit daaff12)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
@smbas @cc9cii
Fix missing break in switch statement
3821bff 
(cherry picked from commit 9a8ca81)
@smbas @cc9cii
Make saving of deleted ESM records more consistent
d789d93 
(cherry picked from commit f9b0b7e)
@cc9cii
Move common subrecord definitions (NAME, DELE) to defs.hpp
41ee50c 
(cherry picked from commit fc8e408)
@cc9cii
esmtool fix
25bb8a5 
(cherry picked from commit 9116c70)

Conflicts:
	apps/esmtool/record.cpp
@cc9cii
Delete empty test
f9e12d6 
(cherry picked from commit d0d8c2e)
@cc9cii
Tests: add dialogue_merging_test (requires some data files)
c221be7 
(cherry picked from commit 38c155c)
@cc9cii
Tests: add content_diagnostics_test (requires some data files)
c3031da 
(cherry picked from commit 771193b)
@cc9cii
Tests: add record deletion test
d3ada38 
(cherry picked from commit 1e817a9)
@cc9cii
Tests: add record overwrite test
0d9ffe8 
(cherry picked from commit f91aae2)
@cc9cii
Adjust tests to work with esm_rewrite branch.
33c0db1 
(cherry picked from commit aae1aa3)
@cc9cii
Resolve merge issues.
1334091
@ananace @cc9cii
Add FFMPEG to include path for OpenMW
940e982 
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)
@cc9cii
Remove unused SOUND_INPUT_INCLUDES cmake variable.
d3caeaf 
(cherry picked from commit 0220e82)

Conflicts:
	apps/openmw/CMakeLists.txt
@cc9cii
Fix double writing of Dialogue NAME in OpenCS
ebf9ffd 
(cherry picked from commit af49235)
@cc9cii
Ignore Creature INDX subrecords
0eca29e 
Found in some .ess files, not sure what they mean.

(cherry picked from commit 0bdfd1b)
@zinnschlag @cc9cii
adjusted startup warning message for recent improvements regarding lo…
30b28bf 
…ading/saving

(cherry picked from commit e0e9e7f)
@zinnschlag @cc9cii
Removed validator for filenames in OpenMW-CS (Fixes OpenMW#2918)
0366a05 
(cherry picked from commit b74b274)
@zinnschlag @cc9cii
hide script error list when there are no errors (Fixes OpenMW#2867)
2c5f0bf 
(cherry picked from commit 1093a53)
@zinnschlag @cc9cii
do not adjust error panel height if panal was already open
8da783d 
(cherry picked from commit 26640d1)
@zinnschlag @cc9cii
remember script error panel height per scriptsubview
8c4d414 
(cherry picked from commit f5c61ee)
@zinnschlag @cc9cii
make initial size of script error panel configurable (Fixes OpenMW#2996)
ec00bd2 
(cherry picked from commit 99500f4)
@cc9cii
StringUtils: use the locale-unaware tolower function
a1939ae 
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)
@cc9cii
Not found Land Textures are no longer a fatal error (Bug OpenMW#3037)
3c02703 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.

(cherry picked from commit 35fa1f5)
@cc9cii cc9cii closed this Dec 5, 2015
@cc9cii cc9cii deleted the master-cherry-pick-4 branch December 5, 2015 08:35
@cc9cii cc9cii changed the title Merge master (cherry pick 4) Please ignore Dec 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone