Commit graph

4201 commits

Author SHA1 Message Date
kervala
d2419ff74e Merge 2014-08-17 16:08:25 +02:00
kervala
74a30afcc4 Changed #172 XML floating point serialization not using neutral culture 2014-08-17 16:05:51 +02:00
kaetemi
85cd41355d Additional fix #172 set _Locale to NULL after release 2014-08-17 16:02:51 +02:00
kaetemi
7c328658fb Fix continent path bug 2014-08-17 15:58:42 +02:00
kervala
4f4a3469d3 Fixed #172 XML floating point serialization not using neutral culture 2014-08-17 15:39:30 +02:00
kaetemi
4d4a885f7a Maxscript selection clear fix 2014-08-16 14:51:29 +02:00
kaetemi
2cd74c193f Zone light exporter adjust 2014-08-16 14:51:29 +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
botanic
67ab6b4377 updated hgignore 2014-08-15 03:55:49 -07:00
botanic
a2312c1e1b updated doxygen 2014-08-15 03:49:39 -07:00
shubham_meena
2c580b97aa Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
2014-08-15 01:05:39 +05:30
shubham_meena
1b5a6ec066 code modified to accept request through Rest and sending achievments in response 2014-08-15 00:24:31 +05:30
shubham_meena
771070ab19 bug fix in plugin installation 2014-08-15 00:13:00 +05:30
shubham_meena
4087169084 added option for posting data in REST api 2014-08-14 22:25:16 +05:30
shubham_meena
d865f2932b BugFixes: achievements and API key management plugins 2014-08-14 22:20:05 +05:30
shubham_meena
43959ab55d small bug fix: support group missing brackets at end 2014-08-13 18:32:13 +05:30
shubham_meena
34d5d60779 Added few more options in REST api 2014-08-13 12:57:30 +05:30
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
shubham_meena
1005be5905 Bug Fix: delete plugin option available for inactive plugins 2014-08-12 12:46:22 +05:30
shubham_meena
b949fe3144 API key management plugin for ams 2014-08-12 00:33:58 +05:30
shubham_meena
c23e441881 Achievements plugin integrated with ams 2014-08-12 00:33:11 +05:30
shubham_meena
b756f128ba added API key mangement and Achievements plugin during installation of ams 2014-08-12 00:23:48 +05:30
shubham_meena
61b86da6a5 Adding activated plugins to the main options list 2014-08-11 22:57:08 +05:30
dfighter1985
340684e1d6 Don't enter edit mode in the treeview. 2014-08-10 15:25:59 +02:00
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
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
dfighter1985
a51f76d036 Work with translated files, instead of work files. 2014-07-20 17:24:04 +02:00
dfighter1985
b0c916276d Ask for confirmation before deleting a row. 2014-07-19 17:26:59 +02:00
dfighter1985
39c43b03a8 Show insert / delete row in context menu. 2014-07-19 17:23:53 +02:00
kervala
0c3c9ca77a Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
fab8d1d22f Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +02:00
kervala
b7cf2d3774 Fixed: Initialization of pointers in constructor 2014-07-19 14:02:43 +02:00
kervala
875ab80728 Changed: Minor optimization and warning 2014-07-19 14:01:44 +02:00
kervala
853b6aba0b Changed: Replaced tests with .size() by .empty() because faster 2014-07-19 14:01:03 +02:00
kervala
29e875255f Fixed: Some typos 2014-07-19 13:59:54 +02:00
kervala
dbbb344bde Changed: Minor change 2014-07-19 11:24:07 +02:00
kervala
0d81bb48b8 Changed: Some Big endian swaps (for PowerPC especially) 2014-07-19 11:23:49 +02:00
kervala
d02a3d7fe6 Fixed: Use UTF-8 for French translations
Changed: Improved some translations (more to come)
2014-07-19 11:19:34 +02:00
kervala
0d83dd9162 Fixed: Warning 2014-07-19 11:16:43 +02:00
kervala
389037c26e Changed: Replaced atof by NLMISC::fromString 2014-07-19 11:14:38 +02:00
dfighter1985
ec89725824 Implemented row deletion / insertion. 2014-07-18 01:52:23 +02:00
dfighter1985
237ac85e9c Use the QWidget modified property instead of the UXTEditor's own. 2014-07-18 01:18:41 +02:00
dfighter1985
b86fce833c Allow only 1 instance of the uxt editor. 2014-07-18 01:08:31 +02:00
dfighter1985
80d0c7c9c6 Added copyright headers to the new files. 2014-07-18 00:53:36 +02:00
dfighter1985
de87aca09d Implemented saving. 2014-07-18 00:50:40 +02:00
dfighter1985
512aa4c867 Apply table changes to the loaded data, and offer to save when closing the changed table. 2014-07-18 00:27:05 +02:00
dfighter1985
1df00cc8b3 Set header texts. 2014-07-17 19:17:02 +02:00
dfighter1985
85f1e37155 UXT Editor widget 2014-07-17 19:08:29 +02:00
KISHAN GRIMOUT
77d1f8e4bc fix windows 64-bit crash in client due to VS 64-bit compiler bug, fix #164 2014-07-16 13:47:08 +02:00
kaetemi
94c3613ece Fix #71 2014-07-28 22:16:41 +02:00
kaetemi
a6327001dd Backed out changeset: 7bdb27443f88 2014-07-28 22:15:09 +02:00
kaetemi
b6e703d8f7 Fix self illumination color widget in NeL Material script 2014-07-28 18:32:05 +02:00
kaetemi
1140181fe3 Fix NeL Material script defaults, fix #166 2014-07-28 18:31:40 +02:00
kaetemi
0bcbb3f4aa Adjust 3ds Max plugin versioning info 2014-07-28 18:31:20 +02:00
dfighter1985
bc50ca150b I don't really know what to write here. 2014-07-16 02:52:17 +02:00
dfighter1985
be977a23b7 Set the undostack so we won't crash... 2014-07-15 21:46:16 +02:00
dfighter1985
19570b735d Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash. 2014-07-15 21:41:11 +02:00
dfighter1985
5a39d59fb9 Fixed another crash. 2014-07-15 20:29:57 +02:00
dfighter1985
b55b0c5e0d 'Fixed' the Mission Compiler crash. 2014-07-15 20:19:53 +02:00
dfighter1985
2a6e5115e1 When changing a property make sure to set default to false, so it's actually saved! 2014-07-15 18:51:06 +02:00
kaetemi
722837e8a9 Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
dfighter1985
12d33f1024 Save world editor files. 2014-07-15 01:30:30 +02:00
kaetemi
07d3eba709 Restructure web. IMPORTANT! This moves all web files to a new central directory. Update your configuration if necessary 2014-07-14 20:27:46 +02:00
kaetemi
47bc03522e One set of SQL scripts to rule them all 2014-07-14 19:15:23 +02:00
dfighter1985
cabcff881c Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user. 2014-07-13 21:38:14 +02:00
dfighter1985
5f941d812d Apply property changes. 2014-07-12 01:54:45 +02:00
dfighter1985
790ac4524f Block only the propertychanged signal in the const_string_array property manager. 2014-07-12 00:38:35 +02:00
dfighter1985
3b713d152a Store QtProperty, IPrimitive pairs and look the primitive up when the property changes. 2014-07-12 00:01:17 +02:00
dfighter1985
ae120af5b5 Changed property to p, property is a reserved word in VS. 2014-07-11 20:47:24 +02:00
dfighter1985
3dc9d07f59 Use \n instead of ; as a separator. 2014-07-11 20:41:15 +02:00
dfighter1985
b9e12caaef Identation 2014-07-11 20:37:32 +02:00
dfighter1985
77b98d796c Implemented const_string_array editor. 2014-07-11 20:35:05 +02:00
dfighter1985
a4ccf0b86c Workaround related to the unknown statusbar crash. 2014-07-09 23:20:50 +02:00
dfighter1985
f694cfdb8e Copyright banner + line endings... I always mess this up somehow.. 2014-07-09 21:13:57 +02:00
dfighter1985
2ca6c73d09 Texture chooser now supports atlas textures as well. 2014-07-09 21:07:12 +02:00
kaetemi
3650ef83b7 Fix #162: Center ingame mouse cursor after login 2014-07-09 12:31:22 +02:00
kaetemi
24e8caf0fb Formatting: Use tabs 2014-07-09 16:59:55 +02:00
KISHAN GRIMOUT
bd257f42c7 fix windows 64bit build in mem_displayer.cpp 2014-07-09 13:41:43 +02:00
dfighter1985
559968ba41 Added texture property editor, editor factory, manager. Textures can now be selected using these in the property tree browser. 2014-07-08 18:59:30 +02:00
dfighter1985
3b0b82423f Added action property editor, editor factory, manager. Actions can now be edited using the editor widget in the property tree. 2014-07-08 18:26:20 +02:00
dfighter1985
6f3e230cad Allow TextureChooser's texture selection to be queried. 2014-07-07 19:19:03 +02:00
shubham_meena
e00922c699 fixed few bugs 2014-07-07 13:56:58 +05:30
dfighter1985
c736145c2f CPath can now return the file list with a path filter. 2014-07-06 23:21:25 +02:00
shubham_meena
06b6e788f4 branch updated 2014-07-07 02:12:40 +05:30
shubham_meena
cc6c18cb47 merging conflicts 2014-07-07 01:57:08 +05:30
shubham_meena
48cf2559de removed merged conflicts 2014-07-07 01:48:42 +05:30
shubham_meena
f130781223 updates database 2014-07-05 13:01:56 +05:30
dfighter1985
28807c5eea Make sure to always convert to plain bitmap. 2014-07-05 03:31:21 +02:00
dfighter1985
2a47ce3292 No need to store the loaded image data after passing it to the label. 2014-07-05 03:13:01 +02:00
dfighter1985
95defff448 Prototype of the texture chooser. 2014-07-05 02:55:46 +02:00