Commit graph

4070 commits

Author SHA1 Message Date
dfighter1985
04095561cb Merge default 2014-08-07 00:03:09 +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
shubham_meena
a313d66c89 rest api using curl 2014-08-04 14:05:11 +05:30
kaetemi
2ad030f5f9 GL: Occlusion query bugfix 2014-08-03 22:15:12 +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
kervala
5f5f0dd76c Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kervala
9f3717bda0 Fixed: build_interface currently only works with 32 bits bitmaps 2014-08-02 10:58:50 +02:00
kervala
97fcba17cd Fixed: VC++ 2010 compiler bug in for loop variables reuse 2014-08-02 10:57:31 +02:00
kervala
6fb6baeb90 Fixed: Some NeL tools in 3d directory don't need NeL 3D 2014-08-01 17:17:53 +02:00
kervala
a2c797551d Fixed: Compilation of PACS tools without NeL 3D 2014-08-01 17:00:08 +02:00
shubham_meena
6388c2e3aa API key management calender 2014-08-01 16:01:35 +05:30
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
kaetemi
8c58150e83 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kaetemi
7d835464f0 Crash workaround in IG loading, ref #171 2014-07-31 19:50:25 +02:00
kaetemi
af99ad6085 Bugfix 2014-07-30 21:47:48 +02:00
kaetemi
98db1841c3 Fix XRef ligo export 2014-07-30 20:56:28 +02:00
kaetemi
fa64fb9359 Faster ligo export step 2014-07-30 20:56:28 +02:00
kaetemi
c062aab85a Crashfix for 3ds Max export 2014-07-30 20:56:28 +02:00
kaetemi
21282fe62e Cleanup 2014-07-29 16:48:14 +02:00
kaetemi
413fb4bfbe Fix Skin export interface issue, #169 2014-07-29 15:42:11 +02:00
kaetemi
f563a9642e Add warning 2014-07-29 15:23:51 +02:00
kaetemi
1c1d7a2e4a Crashfix Physique export 2014-07-29 15:23:06 +02:00
kaetemi
b74a24a312 Remove a debug assert 2014-07-29 14:39:07 +02:00
kaetemi
56c6bf21fd Bugfix 2014-07-29 14:25:28 +02:00
kaetemi
c447405078 Initialize object viewer viewport at correct size 2014-07-29 14:10:40 +02:00
kaetemi
268d692b03 Compile fix 2014-07-29 14:09:08 +02:00
nimetu
25b5ff5c1d Crafted tool durability, fix #156 2014-07-28 23:51:25 +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
shubham_meena
03b029188f bug fix: added template path option in .info file 2014-07-26 00:27:57 +05:30
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
8971f98722 Merged default. 2014-07-22 00:15:50 +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