mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity
14,084 Commits 17 Branches 67 Tags
Commit Graph

2294 Commits

Author SHA1 Message Date
cc9cii
306bfcbdf2 Fix exception when deleting a record while dialogue subview for that record is open. 2015-12-08 00:27:20 +11:00
cc9cii
68e16b6cee Convert RefNum index map to use find(). 2015-12-06 21:19:06 +11:00
cc9cii
a967418a5a Fix Preview and Unpaged World subviews not rendering. Not sure if this is related to a later version of Ogre being used. 2015-12-06 19:50:26 +11:00
cc9cii
ff072441fd Change the loader's top progress bar to show total number of records processed rather than the number of files. 2015-12-06 19:48:56 +11:00
cc9cii
19af94b73e Reduce copying further by adding move constructors and move assignment operators to CellRef structs. 2015-12-06 15:20:45 +11:00
cc9cii
23e7e3c165 Use std::unique_ptr to store records in collections, RefidCollection and RefIdData. 
- std::move support required (C++11)
- MSVC 2013 or later should be fine
 2015-12-06 15:14:05 +11:00
cc9cii
257126ed69 Call push_back() if inserting to the end of the vector. It seems MSVC may be generating different code compared to insert(). 2015-12-05 20:50:47 +11:00
cc9cii
77394fce99 Fix table being sorted twice (at least it appeared that way according to the sample profiler) 
- Quoting Qt-4.8: "Note: . Setting the property to true with setSortingEnabled() immediately triggers a call to sortByColumn() with the current sort section and order."
 2015-12-05 20:38:09 +11:00
cc9cii
f029682057 Merge branch 'cc9cii' into minor-enhancements 
Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/refidcollection.cpp
 2015-12-05 19:55:32 +11:00
scrawl
3c02703876 Not found Land Textures are no longer a fatal error (Bug #3037) 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.

(cherry picked from commit 35fa1f5865bcb8370505f0a2b641c8363024c8a7)
 2015-12-05 18:14:55 +11:00
Marc Zinnschlag
ec00bd2c98 make initial size of script error panel configurable (Fixes #2996) 
(cherry picked from commit 99500f40212c7b37a536c2692d5b066c26c79bbf)
 2015-12-05 17:45:58 +11:00
Marc Zinnschlag
8c4d414635 remember script error panel height per scriptsubview 
(cherry picked from commit f5c61ee616bfaed911a574c6d43aa6842c224773)
 2015-12-05 17:45:45 +11:00
Marc Zinnschlag
8da783d877 do not adjust error panel height if panal was already open 
(cherry picked from commit 26640d17eb053176b45482e801236415a42ddf1f)
 2015-12-05 17:45:32 +11:00
Marc Zinnschlag
2c5f0bf6c5 hide script error list when there are no errors (Fixes #2867) 
(cherry picked from commit 1093a53cf9f2a85374e145d96bb21bfb46eb13ad)
 2015-12-05 17:45:16 +11:00
Marc Zinnschlag
0366a05649 Removed validator for filenames in OpenMW-CS (Fixes #2918) 
(cherry picked from commit b74b274ac0e88ad7c833b908bb301dee3986264f)
 2015-12-05 17:44:59 +11:00
Marc Zinnschlag
30b28bfd07 adjusted startup warning message for recent improvements regarding loading/saving 
(cherry picked from commit e0e9e7f8c2e2e666f125c2c3a8b1c098ec4ea43a)
 2015-12-05 17:44:40 +11:00
scrawl
ebf9ffd1da Fix double writing of Dialogue NAME in OpenCS 
(cherry picked from commit af4923577b4f97ef4f5c6e89c58bf4badf3228ec)
 2015-12-05 17:33:13 +11:00
cc9cii
1334091613 Resolve merge issues. 2015-12-05 17:28:32 +11:00
Stanislav Bas
2abdeef2e0 Remove unused includes 
(cherry picked from commit daaff1284e26d13358b130d7b44721ced210066d)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
 2015-12-05 11:23:57 +11:00
Stanislav Bas
f4587e48f3 Load methods (for ESM records) accept a deleted flag in OpenCS 
(cherry picked from commit 13bb6be2383c808084eabed0cb1bfb3b9749e55a)

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
 2015-12-05 11:22:51 +11:00
Stanislav Bas
7013ba751c Fix build errors & warnings 
(cherry picked from commit 1e8182220ae7c14de13ab634c82f2b14444c0e69)
 2015-12-05 11:19:22 +11:00
Stanislav Bas
0277a4e8c4 Implement saving of deleted records 
(cherry picked from commit 8e6a7be6f543a112c6aa3e814f572a9d2839ab15)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
 2015-12-05 11:18:15 +11:00
Stanislav Bas
a120bb2b54 Delete infos of deleted dialogue when loading a content file 
(cherry picked from commit e04e32bcffa3c95f7c2a007d5fcf09641fff0b03)
 2015-12-05 09:46:53 +11:00
Stanislav Bas
9a803739ff Add a separate method to check whether a record is deleted or not for IdCollection 
(cherry picked from commit a4d3e59e5c7380ffb27b4d17d4574009e2b45379)
 2015-12-05 09:46:40 +11:00
Stanislav Bas
4e199697cc Handle deleted records in RefCollection 
(cherry picked from commit 3ba73f5fd9feb9727b56f32767c848e520d9a94c)
 2015-12-05 07:20:22 +11:00
Stanislav Bas
9503104129 Return a correct index for a loaded record that was deleted 
(cherry picked from commit a1389b87bacd08f54c4c146c7a0b6d1ed51edc54)
 2015-12-05 07:19:55 +11:00
Stanislav Bas
0979d88b0c Rework RefIdData code. Update the index map when a new record is loaded 
(cherry picked from commit 5e623a2a1d06d5679f214cad95123a1d3bd88b34)
 2015-12-05 07:19:43 +11:00
Stanislav Bas
bd695feded Remove INAM handling from InfoCollection 
(cherry picked from commit 71e5fc7f0458f77e94879399a39e36393ed19409)
 2015-12-05 07:19:18 +11:00
Stanislav Bas
d518d70212 Remove NAME and DELE handling from IdCollection 
(cherry picked from commit 74a055f3ccbe25e50d2947d6fe639a84e3138ec7)
 2015-12-05 07:18:39 +11:00
Stanislav Bas
639e6e1c56 Remove DELE and NAME handling from RefIdCollection and RefIdData 
(cherry picked from commit 42f9136141657cbe3fd0801c579e37dd1ff47a30)
 2015-12-05 07:18:27 +11:00
cc9cii
19eed6f4c4 Fix warning C4458 (declaration of 'data' hides class member) 2015-11-22 19:23:11 +11:00
cc9cii
4290751010 Fix warning C4457 (declaration hides function parameter) 2015-11-22 19:17:10 +11:00
cc9cii
d70064efe4 Fix warning C4456 (declaration hides previous local declaration) 2015-11-22 19:15:06 +11:00
cc9cii
cc984497d7 Fix warning C4838 (conversion from 'double' to 'const float' requires a narrowing conversion) 2015-11-22 18:49:58 +11:00
cc9cii
f68e423c33 Add missing Ogre headers. 2015-11-22 18:43:44 +11:00
cc9cii
a38881e4cf Further clean up of moving out NpcAutoCalc from Data. 2015-11-08 09:45:12 +11:00
cc9cii
04c5c0d82a Move NPC autocal code out to a separate class. 2015-11-08 06:02:53 +11:00
cc9cii
9716b671f1 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
 2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4 Merge branch 'pathgrid-edit' into Feature-1278 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
 2015-11-07 11:56:34 +11:00
cc9cii
007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. 
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
 2015-11-07 07:17:46 +11:00
cc9cii
fb3015c9b8 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
 2015-11-07 06:30:46 +11:00
cc9cii
12a8692cdb Fix include file issue. 
(cherry picked from commit 7f477e2fae47bdfe78ac17b2622ed2fdd844fd98)
 2015-11-02 18:50:02 +11:00
cc9cii
6d38d97470 Fix some sub-tables becoming uneditable since commit 80869d 
(cherry picked from commit 4af469511da373c48d7b3eaa0b4e1eb37971558c)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
 2015-11-02 18:49:48 +11:00
cc9cii
a19a1dabe2 Add a check for scale value of 0. Should resolve bug #2880. 
(cherry picked from commit 819fecd08ec163e3f6b94ca40330f68214d54579)
 2015-11-02 18:46:34 +11:00
cc9cii
26195dc5fe Rename a variable to make it less confusing. 
(cherry picked from commit 7c007d9c6d530126075165766a8c497bd3de7d62)
 2015-11-02 18:46:21 +11:00
cc9cii
894f3a9418 Fix saving when only topic info was modified (topic itself unchanged) 
(cherry picked from commit 78c735adc609dda06954746b31cea4289a7060ad)
 2015-11-02 18:46:04 +11:00
cc9cii
245357c9b2 Move TableEditModes enum inside a class scope. 
(cherry picked from commit 107ccd84d4f411a825c2f095bae7f84e65f8609d)

Conflicts:
	apps/opencs/model/world/refidadapterimp.cpp
 2015-11-02 18:45:17 +11:00
cc9cii
0ec4af4210 Re-add mistakenly removed line and fix a silly typo. 
(cherry picked from commit 77471d1592611fe08b65e6b34b7e656d78753944)
 2015-11-02 06:25:46 +11:00
cc9cii
f08680ebcd Disable context menu for fixed size sub-tables. Should resolve bug #2932. 
(cherry picked from commit 80869d9bae8c472ec7d1dca38eb668cc32850352)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
 2015-11-02 06:25:31 +11:00
cc9cii
b595f2641c Fix issue where mandatory effects field was allowed to be empty (and vice versa) 
(cherry picked from commit 972193c7ebcb597dfdd5b38e72965efa1bb4e70f)
 2015-11-01 23:09:06 +11:00