8fbc799655
Merge remote-tracking branch 'cc9cii/master'
10 years ago
c0f3d70f06
Use the new severity message attribute.
10 years ago
71f3b7ed4f
Fix crash when user preference is missing.
10 years ago
6fbdbb11d5
added refrash menu item to report table ( Fixes #2620 )
10 years ago
21f0b586ec
Rows with the same topic but in different letter case can be reordered
10 years ago
b0aad9c8cb
Merge remote-tracking branch 'smbas/feature-improved-dragndrop'
10 years ago
d1339a643a
Fix for NestedTableProxyModel::forwardDataChanged()
10 years ago
a5670b5133
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
10 years ago
dc37aea8eb
Add missing mappings to TableMimeData
10 years ago
c644f15167
calm down travis
10 years ago
b9f6baf317
add normal script warnings mode ( Fixes #2642 )
10 years ago
197b8ec731
added severity attribute for operation messages ( Fixes #2717 )
10 years ago
8791832c86
standarised on the use of the Message struct when passing operations messages around
10 years ago
0e21c61297
replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct
10 years ago
9a102f81c8
added setting for controlling script compiler warnings
10 years ago
1ee1934053
framework for accessing user settings in operation stages
10 years ago
ced4e237a8
Fix the sorting of Info tables when new row are added
10 years ago
f1a38ffe93
InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row
10 years ago
170692b480
InfoTableProxyModel: invalidate first row cache after row insertion/deletion
10 years ago
581ba55db9
Add Topic/Journal Id completion to InfoCreator
10 years ago
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
88d1f158d0
made double click behaviour in report tables configurable ( Fixes #2622 )
10 years ago
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
a6624ca576
Cache topic/journal first rows in InfoTableProxyModel
10 years ago
2e40b68862
Add a custom proxy model for Info tables
10 years ago
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
10 years ago
cad18969e3
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/mwmechanics/aicombat.cpp
apps/openmw/mwmechanics/aitravel.cpp
10 years ago
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
10 years ago
f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
281088c93b
Add check for an empty sound field to SoundGens verifier
10 years ago
2c15ad5e0c
Add SoundGens verifier
10 years ago
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
10 years ago
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
10 years ago
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
10 years ago
650e37dba1
RegionMap uses proper colors
10 years ago
e516d37cbf
MapColourColumn::set() uses the correct color value
10 years ago
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
10 years ago
d03880fbf0
Compile fix for old boost versions
10 years ago
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
10 years ago
e66e9916db
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
10 years ago
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
10 years ago
5c37079f0c
Include only the columns that are visible for sorting. Should resolve Bug #2611 .
10 years ago
958b34771a
Fix clang warnings about 'typename' outside of a template
10 years ago
bd46ddcf47
Correct the return type in IdTree::data() for Display_Role
10 years ago
b25cc6bc55
IdCompletionManager uses Display type instread of ColumnId for creating completers
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
cdd0623009
Terrain rendering
10 years ago
4e759370de
Change Display_String to the proper display type where appropriate
10 years ago
f84c36b500
CommandDelegate: extract a display type from a model if it isn't specified
10 years ago
2c4025ec72
Rename the method isCompleterExistFor() to hasCompleterFor()
10 years ago
b866e11873
Merge remote-tracking branch 'cc9cii/pathgrid-check-extra'
10 years ago
e636101725
Add missing new lines at the ends of files
10 years ago
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
994c6833bc
Add missing columns for the ID completion
10 years ago
e943d17b29
Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes
10 years ago
602f33bd91
Add ColumnId role to the IdTree data methods
10 years ago
19cc6b83e5
Integrate the Id completion manager into the Document class
10 years ago
87a1f9f9aa
Add ID completion manager
10 years ago
c4aa3d3ee3
Revert user preference setting checks until a thread safe method is worked out. The OSX namespace issue is retained.
10 years ago
01eba7b721
Extra check for thread affinity.
10 years ago
76196d815d
Update user preference setting value via an event message queue.
10 years ago
17747a2dd9
Merge remote-tracking branch 'cc9cii/highlight-colours'
10 years ago
0aaac59cc3
Return to startup dialog when the open/create action is cancelled. Should resolve Bug #2588 .
10 years ago
9cbda0ffad
Allow users to select syntax highlighting colours. Should resolve Feature #2507 .
10 years ago
393cee406f
Use signals for user preference setting updates.
10 years ago
734e52d1c8
Move the user preference check to the preparation step before the running of the operation.
10 years ago
00c165d3a5
Add user preference option to check unused or redundant pathgrid points. Also resolve namespace clash issue in osx.
10 years ago
baaf801521
Merge remote-tracking branch 'cc9cii/loadcell-fix'
10 years ago
674a124bc6
Don't use local type as a template parameter.
10 years ago
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
6966555377
Object verifier check to see if the script used by that object actually exists. Should resolve Bug #2582 .
10 years ago
b7044ac119
Fix crash loading some addon files. Should resolve Bug #2583 .
...
- This may be a bug within QSortFilterProxyModel
- It isn't 100% clear what aspects of these addon files cause the issue, but something about them causes Qt to lose track of its internal row numbers.
10 years ago
ae1a606876
Merge remote-tracking branch 'cc9cii/selective-refresh'
10 years ago
f06ddd47c4
Return the correct range for a given topic. Should resolve Bug #2569 .
10 years ago
aafcaf32c5
Qualify the scope of Flag_Dialogue. (another one)
10 years ago
2f29c2c077
Qualify the scope of Flag_Dialogue.
10 years ago
ec808843c3
Do not rebuild the dialogue subview unless required. Should resolve Bug #2581 .
...
The loss of focus was caused by each text change (i.e. character entry) to a QPlainTextEdit resulting in dataChanged() signal which in turn rebuilt the dialogue subview. Changes in this commit include:
- Do not send signal to update entire row if only a single item has changed.
- Do not rebuild the dialogue subview unless the data item that triggers a conditional display is changed.
- Add column flags to indicate whether the data in this column should rebuild the dialogue subview.
- Return the correct flags for nested columns
- Disable, rather than grey out, checkbox that does not apply to creature levelled list
10 years ago
5f41ef4809
Merge remote-tracking branch 'cc9cii/master'
10 years ago
3c82e6d034
Retrieve the correct index for the type of record being un-deleted.
10 years ago
e6d2821b78
Refresh table filters when the model is updated. Should resolve Bug #2579 .
10 years ago
07ce7b95cf
Merge remote-tracking branch 'cc9cii/npc-additional-data'
10 years ago
c721e340d8
Merge branch 'master' into npc-additional-data
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
21af1913e1
Ensure ColumnId names are unique.
10 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
53b4c15d85
Merge remote-tracking branch 'smbas/master'
10 years ago
b58b7a89ed
Merge remote-tracking branch 'rohit-n/reorder2'
10 years ago
a5183aefbe
Add record state tracking to the ModifyCommand ( Fix #2555 )
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
d27b92e9f1
Avoid gaps between local indexes in RefIdData after removal of records ( Fix #2545 )
10 years ago
aecd9a275e
Remove debugging comments.
10 years ago
2fc964ca73
Grey out disabled entries rather than hiding them.
10 years ago
1d0b8587a1
Use HasWater bit flag rather than mWaterInt bool.
10 years ago
b27a879352
Add the remaining Cell data for editing with dialogue subview. Should resolve Bug #2551 .
...
- NOTE: the interior water flag and water level logic needs reviewing
- does not automatically disable region names for interiors without mQuasiEx flag
- Colour values can't be entered as RGB
- Region names are not drop down menus
10 years ago
0ecfd9119f
Add the remaining Race data for editing with dialogue subview. Should resolve Bug #2546 .
10 years ago
7494340b66
Add the remaining NPC data for editing with dialogue subview. Should resolve Bug #2547 .
10 years ago
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
10 years ago
e9ca022162
Add an optional horizontal scrollbar to the main view window. Should resolve Feature #2549 .
...
- TableSubviews and DialogueSubviews now provide size hints
- Option to stop the growth of the window at the screen boundary for multi-monitor setup with different resolution.
- Three options:
Grow Only: No change to current, except the use of size hints
Scrollbar Only: Simple addition of a scrollbar, the view window does not grow
Grow then Scroll: Window grows as per current behaviour. The scrollbar appears once it cannot grow any further.
10 years ago
27000fb36b
don't reject single precision float values in value filters ( Fixes #2533 )
10 years ago
f92d801faf
Jump to the added/cloned record (or undeleted record in case of undo). Should resolve Feature #2541 . Controlled by radio buttons on user preferences settings.
10 years ago
538e550b2b
Fix for Bug #2543 . Spells magic effect id typo.
10 years ago
2b84598e85
Remove duplicated but reversed map.
10 years ago
ab21c0551c
Provide a default encoding when changing to "Function".
10 years ago
587efcfe9d
Use better initial value type. Fix exception while saving values.
10 years ago
5fb269336f
Don't use initializer list
10 years ago
d6ecc64168
Aggregate types can't be static - osx compiler appears to be more strict.
10 years ago
69317095be
For compiling with osx - try using a different syntax for initializing the static maps.
10 years ago
0c461f4424
Add TopicInfos special conditions table.
10 years ago
1c334a01ce
one more referenceable that escaped the change into object
10 years ago
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago
048d7be87c
Adjusted terminology for references/referenceables in OpenMW-CS user-interface ( Fixes #2516 )
10 years ago
0bf28a6eab
Merge remote-tracking branch 'cc9cii/leveled-list-edit'
10 years ago
b04aeb6aad
Fixed levelled lists flags - now bit masks represented by tick boxes in the dialogue subview.
10 years ago
7b4a9f1ea1
Moved script editor settings to its own section.
10 years ago
8e49ccc2f4
Added user setting options.
10 years ago
7f2bd01f79
Handle plugins that has 0x00 for levelled list types, for example Ravenloft v5.02d, to use 0x01.
10 years ago
f1c0847897
Merge remote-tracking branch 'cc9cii/moveref'
10 years ago
49884f54f7
Fix loading moved references.
10 years ago
ae5de0cb2b
implemented additional check before performing replace (make sure data hasn't been changed since the search)
10 years ago
dab650a3d5
remove rows from result table after a successful replace (configurable via user settings)
10 years ago
33a8cd245a
Fix crash with gcc/linux.
10 years ago
2ef8103cc7
fixed ReportModel::RemoveRows view updates
10 years ago
889749a493
Allow non-empty mOriginalCell (case where a moved ref is moved again)
10 years ago
b54e5714c9
Revert rebasing the moved refs to the new cell, because the original ref may still be referred by a mod.
10 years ago
e0d061c37b
Implemented a workaround for saving moved refs.
10 years ago
7673be6d0f
Loading of moved refs complete.
10 years ago
74b98f7178
Fixed initial loading of moved refs.
10 years ago
2e2d6e04fe
gcc friendly version.
10 years ago
dcce59f76c
Pass MovedCellRef info to RefCollection. Still has debugging code.
10 years ago
932f1f9fbd
Alternative way of finding UniversalId without bloating IdTree.
10 years ago
acb800b8f9
Resolve merge issues and fix typos.
10 years ago
f1a58994c6
Merge branch 'master' into moveref
...
Conflicts:
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/ref.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
components/esm/cellref.hpp
10 years ago
8aaa74a983
Undo for delete operation in referenceables table. Implemented by saving UniversalId::Type in DeleteCommand.
10 years ago
a6925683c6
Off by one error - can't delete the last element of a refid collection.
10 years ago
6fcf4ea9e3
In ModifyCommand replace proxy model with the source model ( Fixes #2498 )
10 years ago
82bc666e00
Make AI package items to be editable when a new row is added.
10 years ago
f7c7aeecb3
fixed missing state update when starting a global search
10 years ago
f326b14604
Allow Qt to cleanup its signals.
10 years ago
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
8b1ac451ac
More warning fixes.
10 years ago
dd1e4e8b69
Remove gcc/clang warnings.
10 years ago
7561b195ab
Revert auto expansion of enums as it was interfering with row based operations. Fix default values of magic effect skill & attributes.
10 years ago
f88be67556
Convert AI package type and AI wander repeat columns in the nested tables to use enum delegate
10 years ago
e241fb0104
Convert clothing/armour part reference type column in the nested tables to use enum delegates.
10 years ago
e00d7f72ac
Convert magic effects ID and Range columns in the nested tables to use enum delegate
10 years ago
befd6fe658
Convert magic effects Skills column in the nested tables to use enum delegates.
10 years ago
d6c2cff381
Convert magic effects Attribute column in the nested tables to use enum delegates.
10 years ago
c41b4b84a6
Cleanup post merge.
10 years ago
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
10 years ago
32e73c3deb
Add creature/item levelled lists (non table items) to dialogue subview.
10 years ago
38ce074a62
Merge branch 'replace'
10 years ago
4951fc477c
added replace function
10 years ago
a2d824bfa6
Changes to support dialogue only items but in a list view via QDataWidgetMapper.
10 years ago
1c7ed795c2
Add creature/item levelled lists to dialogue subview.
10 years ago
513c3a47cb
Add clothing/armor part reference table to dialogue subview.
10 years ago
526b53fce0
Add AI packages table to dialogue subview. Also minor bug fixes.
10 years ago
60e5ff8811
Remove duplicated checks and exceptions.
10 years ago
221c57adee
Fix template syntax and travis warnings.
10 years ago
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
10 years ago
7ccf53e750
Changed over inventory adapters. Fixed a few places where modified records were not set properly.
10 years ago
25261a60e5
Add potion magic effects table to dialogue subview. Integration of the adapters to RefIdCollection is incomplete.
10 years ago
ef84e553be
Renamed some stuff.
10 years ago
41b368a759
Moved templated code around a bit.
10 years ago
4b9c9bf095
Simplify and relocate nested column definitions.
10 years ago
8dab2f9b14
Use human friendly strings in magic effects subtable.
10 years ago
a460409555
Add Spells and Enchantment magic effects table to dialogue subview. The numbers are not yet converted to strings.
10 years ago
49fd5afdf6
Add birthsign spells table to dialogue subview.
10 years ago
f939648736
Add race spells table to dialogue subview.
10 years ago
9c75dad1ac
Why is gcc so unkind?
10 years ago
ea9563ad92
Add faction reactions table to dialogue subview. Fix gcc compile issues. Change nested columns to generic ones where possible.
10 years ago
88bc62e054
Add Region sounds table to dialogue subview.
10 years ago
5da2f53bec
Code reorganisation to prepare for nested sound table in regions.
10 years ago
ce7e2e06c1
Fix editor being created for a non-editable item.
10 years ago
a632b2cfeb
Fix editing "ID" column within nested tables in dialogue subview.
10 years ago
1220369da3
Changes as per feedback comments.
10 years ago
3f4f008c51
another fix to display type handling
10 years ago
7990fab708
Fix crash when exiting via window manager on some systems.
10 years ago
9a564f5062
Fix undo for pathgrid points add/remove.
10 years ago
bc9dad3ff2
Add index columns and fix edge indexing for point deletion.
10 years ago
330920daa8
Fix off by one error(s).
10 years ago
be9f94b766
Adjust edge indexes when adding/removing points. Fix some travis warnings.
10 years ago
23db79ebab
Fix for more gcc differences.
10 years ago
3a46512b7f
Attempt to account for gcc differences.
10 years ago
860754e460
Minor formatting cleanup and comments.
10 years ago
05210d7f21
Nested table support for Pathgrids.
10 years ago
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
10 years ago
3b408b6427
sorting out some Display enum mixup
10 years ago
8eaf6b068c
Adding missing file.
10 years ago
851effb0e3
Merge branch 'master' into NonTableFields
10 years ago
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
10 years ago
66c866aec9
fixed search result formatting
10 years ago
cb6caf5e39
added search-related user settings
10 years ago
4928e3705f
highlight (bold) search string in results
10 years ago
ece34a1baa
Workaround for crash while exiting the application.
10 years ago
619b5206cd
More consistency nit pick.
10 years ago
29ef08bb75
Spelling and other consistencies nit pick.
10 years ago
3d280a6ba5
Fixed the display issues of the nested tables in the dialogue subview. Needs further work but usable for now.
10 years ago
34934f016a
Remove obsoleted OpenCS settings and comment non-ported settings
10 years ago
46ccd27a6d
improved find result text
10 years ago
e8091c4e7e
added field column to report table
10 years ago
416b8165cd
moved getColumnId function from IdTable to IdTable base and made it virtual
10 years ago
a8cdd30124
added ID column to report table
10 years ago
4042b12013
changed data structure for report model
10 years ago
1ec0db231c
add a separate display type for ID column
10 years ago
c5f1c2127d
extend global search to all record and reference tables
10 years ago
8e9365741f
make search sub-views re-usable (clear before starting a new search)
10 years ago
eaaf816dd3
simplified search rules
10 years ago
128ccd8151
improved search type naming
10 years ago
babefacbfa
improved message text in search results
10 years ago
705ee67265
fixed hints getting mixed up with message text
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
23cf859fee
added search stages (cell table only for now)
10 years ago
99e1720980
Add SceneManager and clone utility
10 years ago
72400747f2
OpenCS: preliminary port of cell rendering to OSG
10 years ago
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
10 years ago
78c6268891
added search class and search box widget
10 years ago
af27a10b0c
OpenCS: preliminary port of PreviewWidget to OSG
10 years ago
40fc097722
OpenCS: use the new VFS, restored resource tables
10 years ago
49c2da27b3
OpenCS compiles and runs again (no rendering)
10 years ago
d053c62032
setting up global search operation and subview
10 years ago
76adb64e20
Compilation fix after merging commt e30f24
10 years ago
4d0bb6329a
Fix incorrect reference check
...
This check was broken for exterior cells (empty cell id).
It was superfluous anyway. A CellRef is owned by the cell it is in, so the cell must always exist.
10 years ago
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
10 years ago
cf077dcf5d
Merge remote-tracking branch 'cc9cii/fix-hide-overload-warn'
10 years ago
55bd0c728e
Merge branch 'threadfix'
10 years ago
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
10 years ago
17e6244bd6
Yet more warnings suppressed.
10 years ago
fd86076db3
More warning fixes.
10 years ago
4f6c772437
Fix more warnings.
10 years ago
488bc76da5
Fix saving land data.
10 years ago
589b0b9171
Add saving land and land textures. Should resolve Bug #2447 .
10 years ago
8e37e9a14a
removed redundant functions
10 years ago
8a8db8bc24
Merge remote-tracking branch 'cc9cii/editor-clone-fix'
10 years ago
dc9af19dcf
Don't use C++11 features.
10 years ago
e2ef8c4022
fix -Wnewline-eof warnings
10 years ago
28259f914c
Remove potential memory leak.
10 years ago
43ec933b7b
Revert to the original clone() method. Create a new copy method for modified records.
10 years ago
8ac7b77d36
For RefId's, modify a copy of the base record rather than modifying the record directly.
10 years ago
8b3adec3ec
Added a missing copy constructor.
10 years ago
f90cdec53b
Remove default parameters from the implementation.
10 years ago
6087a18c94
Implement clone() using a new Record constructor.
10 years ago
128371c902
Copy base data to modified.
10 years ago
a54ab153b0
Cloned references should be considered "Base" rather than "Modified". Should fix bug #2429 .
10 years ago
ca21181483
Fix typo to get table display working.
10 years ago
727b68dd15
Reduce difference with the master branch where possible.
10 years ago
6d6ff8c6a4
Resolved compile issues, but not fully working.
10 years ago
0b70fdac57
added start script verifier
10 years ago
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
10 years ago
Marc Zinnschlag
cc9cii
Stanislav Bas
scrawl
Rohit Nirmal
Scott Howard