botanic
|
49370fb5a4
|
Merge
|
2014-09-04 17:27:29 -07:00 |
|
dfighter1985
|
8d3c8de517
|
Enter a log entry when creating new documents.
|
2014-09-04 15:41:17 +02:00 |
|
dfighter1985
|
6457ab90eb
|
Added support for creating new form documents
|
2014-09-03 19:55:46 +02:00 |
|
dfighter1985
|
256d72fe62
|
Added support for new DFN document creation.
|
2014-09-03 19:37:49 +02:00 |
|
dfighter1985
|
d139bc9f8d
|
Added support for new typ document creation.
|
2014-09-03 19:28:01 +02:00 |
|
dfighter1985
|
3e3a9b8585
|
Error messages
|
2014-09-03 19:14:32 +02:00 |
|
dfighter1985
|
6954103b61
|
A little refactoring, dialogs are now loaded using the full filepath.
|
2014-09-03 19:11:38 +02:00 |
|
dfighter1985
|
ec20f009e7
|
Added GUI stub for new types/Dfns/forms.
|
2014-09-03 18:33:09 +02:00 |
|
dfighter1985
|
1be8e6f6a8
|
Removed m_modified, since the base widget has a field for this.
|
2014-09-03 17:25:11 +02:00 |
|
dfighter1985
|
baec2d1155
|
Form editor should trigger the save button properly now.
|
2014-09-03 17:22:09 +02:00 |
|
dfighter1985
|
a0194f5d24
|
Added missing copyright headers.
|
2014-09-03 17:12:25 +02:00 |
|
dfighter1985
|
2802f9e6cb
|
Log changes and save log.
|
2014-09-03 16:42:12 +02:00 |
|
dfighter1985
|
c2738ecf73
|
Mark the typ dialog modified after a modification.
|
2014-09-03 16:26:52 +02:00 |
|
dfighter1985
|
4239748047
|
Apply changes.
|
2014-09-03 16:14:38 +02:00 |
|
dfighter1985
|
43bf6cebed
|
Load type data into the property browser.
|
2014-09-03 16:08:13 +02:00 |
|
dfighter1985
|
d146d91ab1
|
Mark the DFN editor modified after adding / removing an element.
|
2014-09-03 00:00:52 +02:00 |
|
dfighter1985
|
5022549a0d
|
Implemented saving.
|
2014-09-02 23:54:42 +02:00 |
|
dfighter1985
|
3d6a9fb139
|
Implemented add button.
|
2014-09-02 23:37:16 +02:00 |
|
dfighter1985
|
9422a67cf3
|
Implemented definition editing.
|
2014-09-02 23:25:47 +02:00 |
|
dfighter1985
|
8635cd3c65
|
Implemented remove button.
|
2014-09-02 23:07:55 +02:00 |
|
dfighter1985
|
a76a6b6e85
|
Load comments, log, and definitions.
|
2014-09-02 23:00:32 +02:00 |
|
dfighter1985
|
3b270c3e9e
|
Delete DFN when destroying a DFN editor...
|
2014-09-02 22:47:18 +02:00 |
|
dfighter1985
|
a66582cff5
|
Load .typ file.
|
2014-09-02 22:46:19 +02:00 |
|
dfighter1985
|
62fb0ca1ae
|
Added GUI for the Type editor.
|
2014-09-02 22:32:56 +02:00 |
|
dfighter1985
|
5fa370463b
|
Logging DFN changes.
|
2014-09-02 20:13:10 +02:00 |
|
dfighter1985
|
0904c30803
|
No comment. Literally! :D
|
2014-09-02 19:32:05 +02:00 |
|
dfighter1985
|
a875e66696
|
Implemented add and remove buttons.
|
2014-09-02 19:26:02 +02:00 |
|
dfighter1985
|
bca9fd9347
|
Save changes.
|
2014-09-02 15:31:14 +02:00 |
|
dfighter1985
|
298268b88e
|
Change the name in the list too.
|
2014-09-02 15:13:48 +02:00 |
|
dfighter1985
|
8163f41473
|
Enable saving when modified, disable saving after saving.
|
2014-09-02 15:11:28 +02:00 |
|
dfighter1985
|
2292fc96c4
|
Apply changes.
|
2014-09-02 14:54:07 +02:00 |
|
dfighter1985
|
2e9de8cef3
|
Added first iteration of the file path property manager / editor / factory.
|
2014-09-01 23:06:23 +02:00 |
|
dfighter1985
|
3929b62e48
|
Use enum property manager for the type.
|
2014-08-31 23:21:19 +02:00 |
|
dfighter1985
|
23c27349c3
|
Load DFN.
|
2014-08-31 22:42:49 +02:00 |
|
dfighter1985
|
e44733dfa6
|
Added common base class for Typ, Dfn, and From dialogs: GeorgesDockWidget.
|
2014-08-31 21:25:12 +02:00 |
|
dfighter1985
|
ff88a345a8
|
Added GUI for DFN dialog.
|
2014-08-31 20:21:31 +02:00 |
|
dfighter1985
|
f56ab5fbaa
|
Merged default
|
2014-08-30 23:02:14 +02:00 |
|
dfighter1985
|
e5b2d05fa7
|
EOL
|
2014-08-30 22:23:21 +02:00 |
|
dfighter1985
|
2a3751dae2
|
Show an error message when form loading fails.
|
2014-08-30 21:37:11 +02:00 |
|
dfighter1985
|
b11474e6be
|
Renamed signal.
|
2014-08-30 21:32:28 +02:00 |
|
kervala
|
4d50808bfe
|
Fixed: EOL
|
2014-08-30 16:21:25 +02:00 |
|
dfighter1985
|
8d99120409
|
Save the log too, when saving..
|
2014-08-27 20:30:16 +02:00 |
|
dfighter1985
|
2ebc1d59ef
|
Mark file modified even when using the context menu.
|
2014-08-27 20:25:30 +02:00 |
|
dfighter1985
|
127e0b48ef
|
Implemented rename context menu.
|
2014-08-27 20:24:05 +02:00 |
|
dfighter1985
|
6cc882e95e
|
Now logging changes.
|
2014-08-27 19:22:10 +02:00 |
|
dfighter1985
|
14a5a81c60
|
Load log into the log tab.
|
2014-08-27 17:37:53 +02:00 |
|
dfighter1985
|
9249ec3dcb
|
Don't disable the log tab!
|
2014-08-27 17:34:26 +02:00 |
|
dfighter1985
|
55c22bbce8
|
Implement 'delete array entry' context menu command.
|
2014-08-27 16:23:16 +02:00 |
|
dfighter1985
|
58eb1bc9eb
|
Implemented 'append array entry' context menu
|
2014-08-27 01:14:49 +02:00 |
|
dfighter1985
|
205f374a2a
|
Crash fixes related to Georges array size changing.
|
2014-08-20 23:36:53 +02:00 |
|
dfighter1985
|
56b335ca9e
|
Added support for creating arrays.
|
2014-08-20 23:18:16 +02:00 |
|
dfighter1985
|
f32ded34fa
|
Initialize CFormItem fields...
|
2014-08-20 19:57:16 +02:00 |
|
dfighter1985
|
6d19500e35
|
When reaching 0 array size, delete the array node.
|
2014-08-20 18:22:20 +02:00 |
|
kaetemi
|
0f236b800f
|
Merge with default
|
2014-08-19 15:43:49 +02:00 |
|
kaetemi
|
539f10fafa
|
EOL
|
2014-08-19 15:42:42 +02:00 |
|
kaetemi
|
36f77a2ab0
|
EOL
|
2014-08-19 15:38:16 +02:00 |
|
kaetemi
|
2abbd37304
|
EOL
|
2014-08-19 15:37:31 +02:00 |
|
dfighter1985
|
8523452d2b
|
Save from the file menu too.
|
2014-08-19 01:57:20 +02:00 |
|
dfighter1985
|
d4585aea4d
|
Save changes.
|
2014-08-18 19:49:32 +02:00 |
|
dfighter1985
|
6b5f6da809
|
Array resize.
|
2014-08-18 18:03:48 +02:00 |
|
dfighter1985
|
e5a7b28e4b
|
Moved BrowserCtrlPvt to it's own files.
|
2014-08-18 01:50:07 +02:00 |
|
dfighter1985
|
d5dec4a681
|
Use the string 'array size' as the name for the property holding the array size.
|
2014-08-16 03:46:52 +02:00 |
|
dfighter1985
|
408e050ce2
|
Only add atoms to the property browser..
|
2014-08-16 03:10:50 +02:00 |
|
dfighter1985
|
3c90938c47
|
Only add atoms to the property browser..
|
2014-08-16 02:51:30 +02:00 |
|
dfighter1985
|
76a7980e23
|
Handle selected arrays too ( show size, changing it isn't implemented yet ).
|
2014-08-16 02:47:29 +02:00 |
|
dfighter1985
|
9128c712e6
|
Only add atoms to the property browser.
|
2014-08-16 02:01:07 +02:00 |
|
dfighter1985
|
02b2fc5b81
|
Fixed a crash. Setting a value into a valueless Georges node doesn't assign a type, which leads to a crash when trying to poll the value directly from the node. However if the value is polled indirectly using the node's name the value can be retrieved without a crash.
|
2014-08-15 23:49:12 +02:00 |
|
dfighter1985
|
2cea18eae8
|
Apply changes.
|
2014-08-12 21:00:33 +02:00 |
|
dfighter1985
|
964a5d4e4c
|
Shown properties can now be edited.
|
2014-08-12 20:17:10 +02:00 |
|
dfighter1985
|
63fd3faad6
|
First iteration of the property browser.
|
2014-08-12 19:26:55 +02:00 |
|
dfighter1985
|
340684e1d6
|
Don't enter edit mode in the treeview.
|
2014-08-10 15:25:59 +02:00 |
|
dfighter1985
|
37e9c885b7
|
Add the property browser library to the CPack archive when generated.
|
2014-08-06 22:59:58 +02:00 |
|
dfighter1985
|
d82d5ec9f6
|
World Editor plugin Linux build fix.
|
2014-08-06 22:12:46 +02:00 |
|
dfighter1985
|
df4755222b
|
GUI Editor Linux build fix
|
2014-08-06 22:10:11 +02:00 |
|
dfighter1985
|
62ea5d19ce
|
Fixed qrc path.
|
2014-08-06 19:54:01 +02:00 |
|
dfighter1985
|
0f42cb7f49
|
Update the tile list right away if the image is replaced.
|
2014-08-06 17:40:39 +02:00 |
|
dfighter1985
|
b41686aa44
|
If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128...
|
2014-08-06 17:14:59 +02:00 |
|
dfighter1985
|
2f56a5eee4
|
Statically load the empty tile image so that we don't need to have over 9000 instances of it. Also display an error message if loading fails on startup.
|
2014-08-06 13:25:50 +02:00 |
|
dfighter1985
|
3fc31ee2ad
|
Removed yet another unused variable.
|
2014-08-06 13:04:30 +02:00 |
|
dfighter1985
|
4f05fea63c
|
Removed unused variable.
|
2014-08-06 13:01:44 +02:00 |
|
dfighter1985
|
f22f9fbc08
|
Repaint immediately when the display channel is changed.
|
2014-08-05 16:01:45 +02:00 |
|
dfighter1985
|
53f771690c
|
Save the last directory where we loaded a tile image from.
|
2014-08-05 15:34:29 +02:00 |
|
dfighter1985
|
f23a557e77
|
Save the last directoy where we loaded a tilebank from.
|
2014-08-05 15:16:25 +02:00 |
|
dfighter1985
|
1e9e492f0f
|
Rotation is now set in the tilebank wrapper and applied when replacing a tile.
|
2014-08-05 13:42:56 +02:00 |
|
dfighter1985
|
6c8ae2fafe
|
Line endings and copyright headers...
|
2014-08-05 13:18:41 +02:00 |
|
dfighter1985
|
29bf9e0a93
|
Set all images by default.
|
2014-08-05 03:35:10 +02:00 |
|
dfighter1985
|
53e118eb04
|
Clear before loading the model data.
|
2014-08-05 03:20:30 +02:00 |
|
dfighter1985
|
a7022146ec
|
Makes no sense, but doesn't seem to be crashing anymore o.O
|
2014-08-05 03:17:29 +02:00 |
|
dfighter1985
|
cc12fb91b4
|
Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
|
2014-08-05 02:58:31 +02:00 |
|
dfighter1985
|
1255cdb3e7
|
Saving tilebank
|
2014-08-04 22:14:39 +02:00 |
|
dfighter1985
|
1309834e49
|
Texture path.
|
2014-08-04 21:59:05 +02:00 |
|
dfighter1985
|
716903fd5f
|
Surface data.
|
2014-08-04 21:53:22 +02:00 |
|
dfighter1985
|
bcfcb5bb83
|
Oriented stuff.
|
2014-08-04 21:41:33 +02:00 |
|
dfighter1985
|
de15faa5d2
|
Vegetation set stuff.
|
2014-08-04 21:33:11 +02:00 |
|
dfighter1985
|
90b9a592b8
|
Most of the functionality works with the new code.
|
2014-08-04 21:22:44 +02:00 |
|
dfighter1985
|
80f7dd725d
|
Started to rework tile checks, tile banks loading / saving. A tilebank will now be in the tilemodel, and it will work from there. Also moved some constants into an independent file.
|
2014-08-03 21:33:13 +02:00 |
|
dfighter1985
|
df4446701e
|
Rotation can now be set.
|
2014-08-03 19:04:34 +02:00 |
|
dfighter1985
|
ca1f00e35a
|
Save the tile border, etc data when saving.
|
2014-08-03 17:58:02 +02:00 |
|
dfighter1985
|
3823a9a01b
|
Added checks. Yes it's horrible and needs to be refactored.
|
2014-08-03 04:15:12 +02:00 |
|
dfighter1985
|
b34db5e7da
|
Apply the current zoom factor!
|
2014-08-01 02:38:04 +02:00 |
|
dfighter1985
|
66c8b95e2d
|
Don't reload the pixmaps every time they are displayed... -.-
|
2014-08-01 02:34:57 +02:00 |
|
dfighter1985
|
2ddd7e1035
|
Line endings...
|
2014-07-31 23:23:52 +02:00 |
|
dfighter1985
|
ab2e54a3c8
|
When hitting 'save as' ask for a filename even if one is set.
|
2014-07-30 15:55:09 +02:00 |
|
dfighter1985
|
6386c5aac4
|
Should store the filename after opening..
|
2014-07-30 15:44:02 +02:00 |
|
dfighter1985
|
8ea69d4b81
|
Should only add 1 tile here...
|
2014-07-30 15:40:02 +02:00 |
|
dfighter1985
|
677d13c7ab
|
128 and 256 tiles don't have alpha, so no need to load/save them.
|
2014-07-30 15:29:50 +02:00 |
|
dfighter1985
|
fadd8fbf89
|
Replace and delete image should be applied to the correct channel now.
|
2014-07-30 14:39:19 +02:00 |
|
dfighter1985
|
0750ca7a4d
|
Show the image that belongs to the channel that is selected.
|
2014-07-30 14:28:17 +02:00 |
|
dfighter1985
|
47a5f95b71
|
Copyright headers...
|
2014-07-30 11:20:29 +02:00 |
|
dfighter1985
|
8e3ec659d5
|
Close the loaded file and return true...
|
2014-07-30 11:15:14 +02:00 |
|
dfighter1985
|
4a69a4f8b2
|
Set teh current selection to row 0
|
2014-07-30 11:14:41 +02:00 |
|
dfighter1985
|
99683c6569
|
Save and load the tilebank texture path.
|
2014-07-30 11:10:15 +02:00 |
|
dfighter1985
|
447caab681
|
Save and load the veget set filename.
|
2014-07-30 10:58:37 +02:00 |
|
dfighter1985
|
e82ffc9b14
|
TileBank loading.
|
2014-07-30 10:54:08 +02:00 |
|
dfighter1985
|
5b2aa71b90
|
Add the already selected tilesets to the land when editing.
|
2014-07-30 07:43:02 +02:00 |
|
dfighter1985
|
240844c1cd
|
Connected the oriented combobox and now saving it's value to the tilebank.
|
2014-07-30 01:50:01 +02:00 |
|
dfighter1985
|
a513af355d
|
Implemented saving of the currently stored tilebank data.
|
2014-07-30 01:29:17 +02:00 |
|
dfighter1985
|
fed92a47d3
|
As it turns out, tilesets can be assigned to multiple lands...
|
2014-07-28 17:05:51 +02:00 |
|
dfighter1985
|
d3698a5c1a
|
Implemented the GUI part of saving...
|
2014-07-27 20:38:08 +02:00 |
|
dfighter1985
|
2f9b4f1b5e
|
128x128 tab should be shown by default.
|
2014-07-27 18:23:25 +02:00 |
|
dfighter1985
|
aef9f58242
|
Implemented tile image replace.
|
2014-07-26 02:24:32 +02:00 |
|
dfighter1985
|
2f6faf05c1
|
Implemented tile image deletion.
|
2014-07-26 02:19:13 +02:00 |
|
dfighter1985
|
39bde4b257
|
A little refactoring.
|
2014-07-26 02:11:02 +02:00 |
|
dfighter1985
|
fe044b8592
|
Reindex tile item nodes after deleting a node.
|
2014-07-26 02:05:21 +02:00 |
|
dfighter1985
|
fc4856f28c
|
Implemented tile deletion.
|
2014-07-26 01:57:50 +02:00 |
|
dfighter1985
|
4d0002a6f4
|
I must be blind...
|
2014-07-26 00:32:42 +02:00 |
|
dfighter1985
|
a1b8737776
|
Implemented Tile addition.
|
2014-07-26 00:29:37 +02:00 |
|
dfighter1985
|
41f8104f19
|
Implemented tilebank texture path setting.
|
2014-07-24 23:41:42 +02:00 |
|
dfighter1985
|
a14a16f935
|
Implemented choosing / resetting vegetset for tile sets.
|
2014-07-24 23:31:37 +02:00 |
|
dfighter1985
|
7b13b09e01
|
When selecting another land, select the first tile set, if it exists.
|
2014-07-24 18:44:00 +02:00 |
|
dfighter1985
|
8034eac2e0
|
Connect the selection model so the widgets are updated.
|
2014-07-24 18:39:34 +02:00 |
|
dfighter1985
|
25dba4695d
|
Each land has it's own TilesetModel now. When changing the land the model also changes.
|
2014-07-24 18:31:07 +02:00 |
|
dfighter1985
|
c1d6ada9c6
|
Implemented land name changing.
|
2014-07-24 16:25:28 +02:00 |
|
dfighter1985
|
c81e70b9b2
|
Implemented land removal.
|
2014-07-24 16:20:44 +02:00 |
|
dfighter1985
|
7c1f53994d
|
Implemented land adding.
|
2014-07-24 16:18:01 +02:00 |
|
dfighter1985
|
f67e5b4e5b
|
Renamed land related widgets.
|
2014-07-24 16:09:58 +02:00 |
|
dfighter1985
|
347a883d7b
|
Implemented tileset move up and move down.
|
2014-07-24 02:28:19 +02:00 |
|
dfighter1985
|
764b80b751
|
Implemented tileset rename.
|
2014-07-23 21:53:09 +02:00 |
|
dfighter1985
|
acf3f656b2
|
Implemented tileset removal.
|
2014-07-23 18:35:26 +02:00 |
|
dfighter1985
|
068a10ea6d
|
Don't try to delete the same items more than once!
|
2014-07-22 15:38:26 +02:00 |
|
dfighter1985
|
c369f49b8a
|
Don't allow 2 tilesets to have the same name.
|
2014-07-22 15:35:14 +02:00 |
|
dfighter1985
|
395fafd2fe
|
Update qrc location.
|
2014-07-22 14:44:31 +02:00 |
|
dfighter1985
|
bfb04d7dda
|
Error message when files can't be opened.
|
2014-07-21 23:25:35 +02:00 |
|
dfighter1985
|
7c0cd64ae7
|
Added save and save as items to the context menu.
|
2014-07-21 23:08:05 +02:00 |
|
dfighter1985
|
d63c78b503
|
Shouldn't crash when adding a new row.
|
2014-07-21 17:46:01 +02:00 |
|
dfighter1985
|
741fee935e
|
Mark translated item with green, untranslated ones with red.
|
2014-07-21 04:11:53 +02:00 |
|
dfighter1985
|
7988a71c98
|
New context menu options: mark / unmark translated.
|
2014-07-21 03:51:03 +02:00 |
|
dfighter1985
|
232e830c3c
|
Make sure a correct hash is not used for untranslated strings.
|
2014-07-21 03:24:18 +02:00 |
|
dfighter1985
|
164eac0eba
|
Save to the right file.
|
2014-07-20 20:03:16 +02:00 |
|
dfighter1985
|
ad06212de7
|
Set header text according to the language.
|
2014-07-20 19:52:23 +02:00 |
|