cc9cii f7eb502493 Add missing fields for editing creatures. ...

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

(cherry picked from commit 5a5e1a3b22e21d8fb847f4ab04497c2d4fdaf4c5)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp

2015-11-01 20:36:24 +11:00

..

model

Add missing fields for editing creatures.

2015-11-01 20:36:24 +11:00

view

Rationalise the use of ColumnIds

2015-11-01 20:28:13 +11:00

CMakeLists.txt

create merged document and open a view for it (document is still empty at this point)

2015-11-01 13:31:28 +11:00

editor.cpp

create merged document and open a view for it (document is still empty at this point)

2015-11-01 13:31:28 +11:00

editor.hpp

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

2015-11-01 13:22:42 +11:00

main.cpp

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00