Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
4245 commits 14 branches 1 tag 255 MiB
Commit graph

4086 commits

Author SHA1 Message Date
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
dfighter1985
431178321f TileBank loading. 
--HG--
branch : gsoc2014-dfighter
 2014-07-30 10:54:08 +02:00
dfighter1985
c8914248db Add the already selected tilesets to the land when editing. 
--HG--
branch : gsoc2014-dfighter
 2014-07-30 07:43:02 +02:00
dfighter1985
ddc7961e9b Connected the oriented combobox and now saving it's value to the tilebank. 
--HG--
branch : gsoc2014-dfighter
 2014-07-30 01:50:01 +02:00
dfighter1985
95b67026bf Implemented saving of the currently stored tilebank data. 
--HG--
branch : gsoc2014-dfighter
 2014-07-30 01:29:17 +02:00
kaetemi
8e7a3b27d7 ryzomcore/v0.9.1 2014-07-29 19:21:25 +02:00
kaetemi
c461502dc7 Crash workaround in IG loading, ref #171 2014-07-31 19:50:25 +02:00
kaetemi
8d8d340968 Bugfix 2014-07-30 21:47:48 +02:00
kaetemi
1cf184c09d Fix XRef ligo export 2014-07-30 20:56:28 +02:00
kaetemi
e58df5f7e9 Faster ligo export step 2014-07-30 20:56:28 +02:00
kaetemi
c8dcfe8d05 Crashfix for 3ds Max export 2014-07-30 20:56:28 +02:00
kaetemi
9061eb8389 Cleanup 2014-07-29 16:48:14 +02:00
kaetemi
f49e9c5df1 Fix Skin export interface issue, #169 2014-07-29 15:42:11 +02:00
kaetemi
a9e3804011 Add warning 2014-07-29 15:23:51 +02:00
kaetemi
7d8e803f7a Crashfix Physique export 2014-07-29 15:23:06 +02:00
kaetemi
6b0d468240 Remove a debug assert 2014-07-29 14:39:07 +02:00
kaetemi
9f19ade30c Bugfix 2014-07-29 14:25:28 +02:00
kaetemi
2b8e006981 Initialize object viewer viewport at correct size 2014-07-29 14:10:40 +02:00
kaetemi
617d1235d1 Compile fix 2014-07-29 14:09:08 +02:00
nimetu
0d2fc4696f Crafted tool durability, fix #156 2014-07-28 23:51:25 +02:00
dfighter1985
89c6180144 As it turns out, tilesets can be assigned to multiple lands... 
--HG--
branch : gsoc2014-dfighter
 2014-07-28 17:05:51 +02:00
dfighter1985
8a704b7f5f Implemented the GUI part of saving... 
--HG--
branch : gsoc2014-dfighter
 2014-07-27 20:38:08 +02:00
dfighter1985
b004bb9d01 128x128 tab should be shown by default. 
--HG--
branch : gsoc2014-dfighter
 2014-07-27 18:23:25 +02:00
dfighter1985
4326ca1df8 Implemented tile image replace. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 02:24:32 +02:00
dfighter1985
5866a61cff Implemented tile image deletion. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 02:19:13 +02:00
dfighter1985
599ba19de2 A little refactoring. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 02:11:02 +02:00
dfighter1985
e06858f2df Reindex tile item nodes after deleting a node. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 02:05:21 +02:00
dfighter1985
f0a67d0c2e Implemented tile deletion. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 01:57:50 +02:00
dfighter1985
d31dfdb6e4 I must be blind... 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 00:32:42 +02:00
dfighter1985
d2a414edb4 Implemented Tile addition. 
--HG--
branch : gsoc2014-dfighter
 2014-07-26 00:29:37 +02:00
shubham_meena
3b3a595903 bug fix: added template path option in .info file 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-07-26 00:27:57 +05:30
dfighter1985
78f4654063 Implemented tilebank texture path setting. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 23:41:42 +02:00
dfighter1985
df7307583b Implemented choosing / resetting vegetset for tile sets. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 23:31:37 +02:00
dfighter1985
2993c88a5d When selecting another land, select the first tile set, if it exists. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 18:44:00 +02:00