Commit graph

4119 commits

Author SHA1 Message Date
kaetemi
573fb44088 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
kaetemi
46aa5cef29 EOL 2014-08-19 15:42:42 +02:00
kaetemi
02e8f6e956 EOL 2014-08-19 15:38:16 +02:00
kaetemi
8fab3ccce1 EOL 2014-08-19 15:37:31 +02:00
dfighter1985
a810b29ec7 Merged default.
--HG--
branch : gsoc2014-dfighter
2014-08-19 00:33:03 +02:00
kaetemi
5dd07248a1 Merge 2014-08-18 21:14:27 +02:00
kaetemi
683a0adc60 Crashfix in case pacs_prim are exported into .ig 2014-08-18 20:23:27 +02:00
dfighter1985
0b44c8a7a0 Save changes.
--HG--
branch : gsoc2014-dfighter
2014-08-18 19:49:32 +02:00
shubham_meena
d75473f567 documentation for doxygen containing plugin management system 2014-08-18 21:43:24 +05:30
dfighter1985
827faaf3e7 Array resize.
--HG--
branch : gsoc2014-dfighter
2014-08-18 18:03:48 +02:00
Matthew Lagoe
941c2e3220 Merged in shubham_meena/ryzomcore (pull request #70)
Adding comments with more description and removed doxygen errors
2014-08-18 00:55:01 -07:00
shubham_meena
c9f54c3806 Improved documentation with doxygen generated doc 2014-08-18 07:13:15 +05:30
dfighter1985
6000fe187f Moved BrowserCtrlPvt to it's own files.
--HG--
branch : gsoc2014-dfighter
2014-08-18 01:50:07 +02:00
kaetemi
0e0de8ec52 Fix shape lightmap optimize 2014-08-17 19:40:43 +02:00
kaetemi
9a19f2041b Crashfix in case pacs_prim are exported into .ig 2014-08-17 19:37:20 +02:00
kaetemi
d4b7a3cf8a Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:48:51 +02:00
kaetemi
8f7931d6a8 Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:41:09 +02:00
kaetemi
e0e1953f41 Crashfix in case pacs_prim are exported into .ig 2014-08-17 16:22:56 +02:00
kervala
e811ff77b1 Merge 2014-08-17 16:08:25 +02:00
kervala
31e9934ba7 Changed #172 XML floating point serialization not using neutral culture 2014-08-17 16:05:51 +02:00
kaetemi
104d6d587a Additional fix #172 set _Locale to NULL after release 2014-08-17 16:02:51 +02:00
kaetemi
75e2841519 Fix continent path bug 2014-08-17 15:58:42 +02:00
kervala
41f6e70dc9 Fixed #172 XML floating point serialization not using neutral culture 2014-08-17 15:39:30 +02:00
kaetemi
5bc60987be Maxscript selection clear fix 2014-08-16 14:51:29 +02:00
kaetemi
f718380f52 Zone light exporter adjust 2014-08-16 14:51:29 +02:00
dfighter1985
fb5ce7baac Use the string 'array size' as the name for the property holding the array size.
--HG--
branch : gsoc2014-dfighter
2014-08-16 03:46:52 +02:00
dfighter1985
6d074bc618 Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
2014-08-16 03:10:50 +02:00
dfighter1985
2a0af6cabf Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
2014-08-16 02:51:30 +02:00
dfighter1985
99502a1bfc Handle selected arrays too ( show size, changing it isn't implemented yet ).
--HG--
branch : gsoc2014-dfighter
2014-08-16 02:47:29 +02:00
dfighter1985
5812058ea6 Only add atoms to the property browser.
--HG--
branch : gsoc2014-dfighter
2014-08-16 02:01:07 +02:00
dfighter1985
c740d5a773 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.
--HG--
branch : gsoc2014-dfighter
2014-08-15 23:49:12 +02:00
botanic
64fafda9bc updated hgignore 2014-08-15 03:55:49 -07:00
botanic
4b871c43f5 updated doxygen 2014-08-15 03:49:39 -07:00
shubham_meena
2a2c2b1d67 Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
2014-08-15 01:05:39 +05:30
shubham_meena
ee6db8ef7f code modified to accept request through Rest and sending achievments in response
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-15 00:24:31 +05:30
shubham_meena
a01e331639 bug fix in plugin installation
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-15 00:13:00 +05:30
shubham_meena
750ded21bd added option for posting data in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-14 22:25:16 +05:30
shubham_meena
f8a92326ed BugFixes: achievements and API key management plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-14 22:20:05 +05:30
shubham_meena
5fd2615f0e small bug fix: support group missing brackets at end
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-13 18:32:13 +05:30
shubham_meena
ac980adcc7 Added few more options in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-13 12:57:30 +05:30
dfighter1985
aa95cc3c4b Apply changes.
--HG--
branch : gsoc2014-dfighter
2014-08-12 21:00:33 +02:00
dfighter1985
1b7b081c60 Shown properties can now be edited.
--HG--
branch : gsoc2014-dfighter
2014-08-12 20:17:10 +02:00
dfighter1985
a43c2f0a5e First iteration of the property browser.
--HG--
branch : gsoc2014-dfighter
2014-08-12 19:26:55 +02:00
shubham_meena
0e4b004978 Bug Fix: delete plugin option available for inactive plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-12 12:46:22 +05:30
shubham_meena
acb4f26f1a API key management plugin for ams
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-12 00:33:58 +05:30
shubham_meena
0d8fe2b7aa Achievements plugin integrated with ams
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-12 00:33:11 +05:30
shubham_meena
70e8310fff added API key mangement and Achievements plugin during installation of ams
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-12 00:23:48 +05:30
shubham_meena
990eae1065 Adding activated plugins to the main options list
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-11 22:57:08 +05:30
dfighter1985
9315b7229e Don't enter edit mode in the treeview.
--HG--
branch : gsoc2014-dfighter
2014-08-10 15:25:59 +02:00
dfighter1985
0f7e1c022a Merge default
--HG--
branch : gsoc2014-dfighter
2014-08-07 00:03:09 +02:00
dfighter1985
033c86e92c Add the property browser library to the CPack archive when generated.
--HG--
branch : gsoc2014-dfighter
2014-08-06 22:59:58 +02:00
dfighter1985
7f6608b897 World Editor plugin Linux build fix.
--HG--
branch : gsoc2014-dfighter
2014-08-06 22:12:46 +02:00
dfighter1985
475c0201ea GUI Editor Linux build fix
--HG--
branch : gsoc2014-dfighter
2014-08-06 22:10:11 +02:00
dfighter1985
48bd3cb383 Fixed qrc path.
--HG--
branch : gsoc2014-dfighter
2014-08-06 19:54:01 +02:00
dfighter1985
50b90f9774 Update the tile list right away if the image is replaced.
--HG--
branch : gsoc2014-dfighter
2014-08-06 17:40:39 +02:00
dfighter1985
20edb57761 If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128...
--HG--
branch : gsoc2014-dfighter
2014-08-06 17:14:59 +02:00
dfighter1985
9bb62a3ada 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.
--HG--
branch : gsoc2014-dfighter
2014-08-06 13:25:50 +02:00
dfighter1985
669c15eda9 Removed yet another unused variable.
--HG--
branch : gsoc2014-dfighter
2014-08-06 13:04:30 +02:00
dfighter1985
e7ded1f82c Removed unused variable.
--HG--
branch : gsoc2014-dfighter
2014-08-06 13:01:44 +02:00
dfighter1985
613643b033 Repaint immediately when the display channel is changed.
--HG--
branch : gsoc2014-dfighter
2014-08-05 16:01:45 +02:00
dfighter1985
edf1da1294 Save the last directory where we loaded a tile image from.
--HG--
branch : gsoc2014-dfighter
2014-08-05 15:34:29 +02:00
dfighter1985
04d17b7a05 Save the last directoy where we loaded a tilebank from.
--HG--
branch : gsoc2014-dfighter
2014-08-05 15:16:25 +02:00
dfighter1985
f25d152f4f Rotation is now set in the tilebank wrapper and applied when replacing a tile.
--HG--
branch : gsoc2014-dfighter
2014-08-05 13:42:56 +02:00
dfighter1985
99bcb6cf79 Line endings and copyright headers...
--HG--
branch : gsoc2014-dfighter
2014-08-05 13:18:41 +02:00
dfighter1985
e2a579c03e Set all images by default.
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:35:10 +02:00
dfighter1985
84fc5f27b6 Clear before loading the model data.
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:20:30 +02:00
dfighter1985
2a55904b3e Makes no sense, but doesn't seem to be crashing anymore o.O
--HG--
branch : gsoc2014-dfighter
2014-08-05 03:17:29 +02:00
dfighter1985
d21aa2b678 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
--HG--
branch : gsoc2014-dfighter
2014-08-05 02:58:31 +02:00
dfighter1985
8bead3f3fd Saving tilebank
--HG--
branch : gsoc2014-dfighter
2014-08-04 22:14:39 +02:00
dfighter1985
92e850d296 Texture path.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:59:05 +02:00
dfighter1985
bdedd145e4 Surface data.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:53:22 +02:00
dfighter1985
55c046252f Oriented stuff.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:41:33 +02:00
dfighter1985
688f6de090 Vegetation set stuff.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:33:11 +02:00
dfighter1985
caf76f09c8 Most of the functionality works with the new code.
--HG--
branch : gsoc2014-dfighter
2014-08-04 21:22:44 +02:00
shubham_meena
204a5b8a18 rest api using curl
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-04 14:05:11 +05:30
kaetemi
1c67d6ec0f GL: Occlusion query bugfix 2014-08-03 22:15:12 +02:00
dfighter1985
30bae94ac3 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.
--HG--
branch : gsoc2014-dfighter
2014-08-03 21:33:13 +02:00
dfighter1985
299629860b Rotation can now be set.
--HG--
branch : gsoc2014-dfighter
2014-08-03 19:04:34 +02:00
dfighter1985
49deedad7d Save the tile border, etc data when saving.
--HG--
branch : gsoc2014-dfighter
2014-08-03 17:58:02 +02:00
dfighter1985
175af2fa74 Added checks. Yes it's horrible and needs to be refactored.
--HG--
branch : gsoc2014-dfighter
2014-08-03 04:15:12 +02:00
kervala
7aedffce9a Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 2014-08-02 11:18:24 +02:00
kervala
b71ec9e7d4 Fixed: build_interface currently only works with 32 bits bitmaps 2014-08-02 10:58:50 +02:00
kervala
ffb7df28ff Fixed: VC++ 2010 compiler bug in for loop variables reuse 2014-08-02 10:57:31 +02:00
kervala
a29f525c99 Fixed: Some NeL tools in 3d directory don't need NeL 3D 2014-08-01 17:17:53 +02:00
kervala
9aabaebc38 Fixed: Compilation of PACS tools without NeL 3D 2014-08-01 17:00:08 +02:00
shubham_meena
ce53f5f26c API key management calender
--HG--
branch : Gsoc14-ryzomAppImprovements
2014-08-01 16:01:35 +05:30
dfighter1985
1a49f9fedb Apply the current zoom factor!
--HG--
branch : gsoc2014-dfighter
2014-08-01 02:38:04 +02:00
dfighter1985
851afcf955 Don't reload the pixmaps every time they are displayed... -.-
--HG--
branch : gsoc2014-dfighter
2014-08-01 02:34:57 +02:00
dfighter1985
1265d6b064 Line endings...
--HG--
branch : gsoc2014-dfighter
2014-07-31 23:23:52 +02:00
dfighter1985
a994f23948 When hitting 'save as' ask for a filename even if one is set.
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:55:09 +02:00
dfighter1985
0cef115a74 Should store the filename after opening..
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:44:02 +02:00
dfighter1985
ac643d2bb9 Should only add 1 tile here...
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:40:02 +02:00
dfighter1985
eee43ad1ea 128 and 256 tiles don't have alpha, so no need to load/save them.
--HG--
branch : gsoc2014-dfighter
2014-07-30 15:29:50 +02:00
dfighter1985
4bff87ca36 Replace and delete image should be applied to the correct channel now.
--HG--
branch : gsoc2014-dfighter
2014-07-30 14:39:19 +02:00
dfighter1985
7b1ee54427 Show the image that belongs to the channel that is selected.
--HG--
branch : gsoc2014-dfighter
2014-07-30 14:28:17 +02:00
dfighter1985
4d54cca6a0 Copyright headers...
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:20:29 +02:00
dfighter1985
ddd687325f Close the loaded file and return true...
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:15:14 +02:00
dfighter1985
ac73999f07 Set teh current selection to row 0
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:14:41 +02:00
dfighter1985
3e2addc057 Save and load the tilebank texture path.
--HG--
branch : gsoc2014-dfighter
2014-07-30 11:10:15 +02:00
dfighter1985
0f5e475d1c Save and load the veget set filename.
--HG--
branch : gsoc2014-dfighter
2014-07-30 10:58:37 +02:00