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

4927 commits

Author SHA1 Message Date
dfighter1985
7c930366de Paint the connection text, boxes separately. 
--HG--
branch : dfighter-tools
 2014-09-13 21:34:47 +02:00
botanic
53ea877a50 update lib sql version 
--HG--
branch : develop
 2014-09-13 10:40:47 -07:00
botanic
3c01c5c811 disable debug mode 
--HG--
branch : develop
 2014-09-13 10:35:21 -07:00
botanic
9be68e3326 Merge 
--HG--
branch : develop
 2014-09-13 10:31:22 -07:00
botanic
9b813a5e4c Fix #122 
--HG--
branch : develop
 2014-09-13 10:31:12 -07:00
botanic
765e614c23 Fix #122 
--HG--
branch : develop
 2014-09-13 10:30:58 -07:00
dfighter1985
aef69eef64 Add a little style. 
--HG--
branch : dfighter-tools
 2014-09-13 18:03:02 +02:00
kaetemi
433d83e2fc Increase texturing limits (*4), ref #203 (TODO: Update config translations) 
--HG--
branch : develop
 2014-09-13 12:14:45 +02:00
kaetemi
7fed632c54 Fix includes 
--HG--
branch : develop
 2014-09-13 12:02:47 +02:00
kaetemi
9678b56ed5 Fix strange code 
--HG--
branch : develop
 2014-09-13 11:13:25 +02:00
dfighter1985
af550acd62 Throw an error message when trying to link nodes that are already linked. 
--HG--
branch : dfighter-tools
 2014-09-13 00:54:37 +02:00
dfighter1985
d2c396bc84 Link nodes and remove and delete the link too when deleting one of the nodes. 
--HG--
branch : dfighter-tools
 2014-09-13 00:43:00 +02:00
dfighter1985
adece7564a Subclassed QGraphicsItem and QGraphicsItemLine. 
--HG--
branch : dfighter-tools
 2014-09-12 23:45:57 +02:00
dfighter1985
83566116d9 Added link action. 
--HG--
branch : dfighter-tools
 2014-09-12 21:01:29 +02:00
kaetemi
6bb136dca9 Change cfg name 
--HG--
branch : develop
 2014-09-12 20:33:20 +02:00
kaetemi
07ee9a4469 Add missing r2_islands_textures tool 
--HG--
branch : develop
 2014-09-12 20:29:50 +02:00
dfighter1985
e2ea5a74b8 We can select multiple items 
--HG--
branch : dfighter-tools
 2014-09-12 19:47:28 +02:00
dfighter1985
cc7e93c96e Added GUI for expression editor. 
--HG--
branch : dfighter-tools
 2014-09-12 19:19:51 +02:00
kaetemi
d12ccf194e Merge with develop 
--HG--
branch : multipass-stereo
 2014-09-12 15:19:12 +02:00
kaetemi
e347b2a97f ryzomcore/v0.10.0 2014-09-12 10:57:31 +02:00
kaetemi
9fd8338849 Add data_common to executables_dev batch 2014-09-12 10:50:19 +02:00
kaetemi
8a3994d95a Replace some hardcoded urls 2014-09-12 10:49:40 +02:00
kaetemi
50f05a2bb9 Remove hardcoded urls 2014-09-12 10:42:42 +02:00
kaetemi
927ecb3dae Remove dead code (CCharacterAchievements, CKnownBrickInfo) 2014-09-12 08:35:49 +02:00
botanic
dcd09e034b Merge 2014-09-11 20:29:14 -07:00
botanic
92afe8e76a FIX #200 
dont crash when neldb is missing
 2014-09-11 10:50:34 -07:00
kaetemi
2abe431675 Regenerate PLR cpp and header 2014-09-11 17:40:53 +02:00
kaetemi
14fda8a39a Add missing leaf 2014-09-11 15:13:17 +02:00
kaetemi
47368e78f9 Remove dead code 2014-09-11 12:12:17 +02:00
kaetemi
0d7c9fd4bf When in Rome, do as the Romans do 2014-09-11 10:36:41 +02:00
kaetemi
6b2b633fed Merge 2014-09-11 10:01:05 +02:00
kaetemi
a9ee3c6b37 Admin web fix 2014-09-11 10:00:10 +02:00
kaetemi
1bf482adc9 Small database adjustment 2014-09-11 09:31:59 +02:00
dfighter1985
1ca2b634ee Merged default. 
--HG--
branch : dfighter-tools
 2014-09-10 20:18:00 +02:00
dfighter1985
52963260a8 Offer to save changes when closing a dialog. 
--HG--
branch : dfighter-tools
 2014-09-10 19:59:38 +02:00
dfighter1985
09ccd8613d When closing a dialog, remove it from the docked dialogs, and delete it. 
--HG--
branch : dfighter-tools
 2014-09-10 19:52:35 +02:00
dfighter1985
97d7fbe6e8 Allow editing of the comment section, and save comments when saving. 
--HG--
branch : dfighter-tools
 2014-09-10 19:14:26 +02:00
dfighter1985
104506a717 Raise the widget after adding. 
--HG--
branch : dfighter-tools
 2014-09-10 18:50:07 +02:00
dfighter1985
78a65459f0 WTF? 
--HG--
branch : dfighter-tools
 2014-09-10 18:49:34 +02:00
dfighter1985
7abd407bc5 oups 
--HG--
branch : dfighter-tools
 2014-09-10 18:04:55 +02:00
dfighter1985
1d028c759c Use a file browser for setting files. 
--HG--
branch : dfighter-tools
 2014-09-10 17:59:22 +02:00
dfighter1985
946685dfac A little refactoring 
--HG--
branch : dfighter-tools
 2014-09-10 17:02:51 +02:00
dfighter1985
c44d910434 Store the filename only in the Dfn value. 
--HG--
branch : dfighter-tools
 2014-09-10 16:44:49 +02:00
kaetemi
fceb2927f4 Add script for installing worldedit data 2014-09-10 16:38:19 +02:00
dfighter1985
e89cde4b93 Properly support color types. 
--HG--
branch : dfighter-tools
 2014-09-10 16:22:08 +02:00
kaetemi
d03c2dcfcd Nice try 2014-09-10 16:00:13 +02:00
nimetu
1a4c2169c5 Fix #161 fix craft success rate display on client 2014-09-10 15:40:32 +02:00
nimetu
ca79af60c6 Fix #143 /muteUniverse on dyn universe channels 2014-09-10 15:38:57 +02:00
nimetu
0cd3ea8d3b Fix #199 Studio object viewer plugin font 2014-09-10 12:19:11 +02:00
kaetemi
9e74156181 Move islands entry points to data 2014-09-10 08:25:45 +02:00
kaetemi
f5fb98764f Remove unused mirror dataset 2014-09-10 08:18:05 +02:00
kaetemi
22fc641666 Merge 2014-09-10 05:28:14 +02:00
kaetemi
89db6c78a7 Use the correct ring database 2014-09-10 05:25:00 +02:00
botanic
cafe41fa24 FIX #192 2014-09-09 17:29:59 -07:00
botanic
74df36b179 FIX #197 
Added default config values that should work for mail config settings in case people are lazy
 2014-09-09 17:26:20 -07:00
botanic
dfdd7698c3 fix windows warnings in sync 2014-09-09 17:20:23 -07:00
dfighter1985
0587d6a687 Create vstruct node when needed. 
--HG--
branch : dfighter-tools
 2014-09-10 00:36:55 +02:00
dfighter1985
e47d480170 Instead of storing the node, store the name and the node type. 
--HG--
branch : dfighter-tools
 2014-09-10 00:28:03 +02:00
dfighter1985
53357ca9ec Don't add Virtual Structs to the property browser! 
--HG--
branch : dfighter-tools
 2014-09-09 22:01:52 +02:00
dfighter1985
821ec6cfad Added support for Virtual Structs. 
--HG--
branch : dfighter-tools
 2014-09-09 21:57:30 +02:00
kaetemi
328eaf592a Use correct AES cfg 2014-09-09 18:58:05 +02:00
kaetemi
55ca1e7a2a Crashfix 2014-09-09 15:50:12 +02:00
kaetemi
7c40248728 Bugfix 2014-09-09 12:39:35 +02:00
kaetemi
0445c3138c Typo 2014-09-09 08:23:37 +02:00
kaetemi
a8f8fa7b63 Don't use magic numbers for the LCT 2014-09-09 08:16:44 +02:00
kaetemi
ea9cf3db93 Typo 2014-09-09 08:15:05 +02:00
kaetemi
f0ac4705d8 Cleanup the AMS theme a bit, improve layouting of user settings 2014-09-09 04:02:15 +02:00
kaetemi
d863ed8a10 Mask database connection error 2014-09-09 02:52:24 +02:00
kaetemi
7cd21d48b4 Merge 2014-09-09 02:30:24 +02:00
botanic
6a36f1f433 fix sync 2014-09-08 17:29:43 -07:00
kaetemi
be78a1cd0b Cache PDO connections and connection failures in a single page load 2014-09-09 02:15:25 +02:00
kaetemi
c4d4587830 Disable APC page caching 2014-09-09 02:14:49 +02:00
botanic
e1c70eb423 dont cache $#1t 2014-09-08 16:23:04 -07:00
botanic
0b579f6306 attachment error checking 2014-09-08 11:59:49 -07:00
botanic
efadbb3f58 make the random generation more secure 2014-09-08 11:46:43 -07:00
botanic
6f1037f829 fix some unset warnings 2014-09-08 05:54:34 -07:00
botanic
2a8ff51169 change some div's so it looks proper 2014-09-08 05:20:28 -07:00
botanic
8be65ec64c turn debugging off 2014-09-08 04:56:13 -07:00
botanic
32745a132b properly display permissions 2014-09-08 04:55:05 -07:00
botanic
4f907c30e6 display the correct plugin page 2014-09-08 03:55:59 -07:00
botanic
7fc83ccd37 set template permissions 2014-09-08 03:29:30 -07:00
botanic
b20008b520 fix menu plugin display 2014-09-08 03:19:13 -07:00
botanic
c3c319944c fix notice 2014-09-08 03:04:34 -07:00
botanic
76dc593a1c fix plugin template 2014-09-08 03:02:11 -07:00
botanic
8d49355c9f fix index issue 2014-09-08 02:57:09 -07:00
botanic
4009772907 Fix smarty issues 2014-09-08 02:36:38 -07:00
botanic
371f666dea Cleanup Domain management code 2014-09-08 02:36:31 -07:00
botanic
1b9986063e Merge 2014-09-08 02:08:26 -07:00
botanic
b58f365473 upgrade smarty to 3.1.19 2014-09-08 02:07:42 -07:00
botanic
52885f20e0 Fix for stupid loop 2014-09-08 02:05:49 -07:00
kaetemi
3e476a9376 Install fix 2014-09-08 10:42:38 +02:00
kaetemi
d651eff10b Cleanup some RYZOMID code 2014-09-08 09:48:28 +02:00
kaetemi
3baf60ad1d Remove dead code in game item manager 2014-09-08 09:37:14 +02:00
kaetemi
e0a1d27dc8 Bugfix in distance prioritizer 2014-09-08 09:09:42 +02:00
botanic
ab06a6ce08 remove testing errorlog 2014-09-07 23:57:31 -07:00
kaetemi
4dda4099de Remove dead code 2014-09-08 08:04:09 +02:00
botanic
4ff51bf600 Merge 2014-09-07 22:27:32 -07:00
botanic
876afdf018 Domain management plugin updates 2014-09-07 22:26:34 -07:00
kaetemi
034c5d7982 Better use this 2014-09-08 07:16:07 +02:00
kaetemi
6031e8666d Enable PHP APC cache for AMS smarty 2014-09-08 07:10:28 +02:00
kaetemi
7448ec51a7 Remove dead declarations in DSS 2014-09-08 05:34:14 +02:00
kaetemi
bde283e8cb Fix SU RSM UAP SQL query 2014-09-08 05:28:09 +02:00
kaetemi
af1b9ed495 Make this extra clear 2014-09-08 01:41:33 +02:00
kaetemi
c902392de3 Enable ring database installation and upgrade in the setup script... 2014-09-08 01:35:47 +02:00
kaetemi
01735e86ad Translation fix 2014-09-08 01:27:46 +02:00
kaetemi
58d2c8be86 Adjust plugin description 2014-09-08 00:42:07 +02:00
kaetemi
8a875b3bab Don't put fixed row id's in insert queries for upgrades 2014-09-08 00:26:54 +02:00
kaetemi
5ec2db090d Bugfix 2014-09-08 00:23:07 +02:00
kaetemi
795b5a9aa0 Don't write version if upgrade failed 2014-09-08 00:21:30 +02:00
kaetemi
fed7dc17ac Bugfix 2014-09-08 00:16:36 +02:00
kaetemi
ed0f753fa9 Fix 2014-09-08 00:11:48 +02:00
kaetemi
f4956721ff Typo 2014-09-08 00:09:12 +02:00
kaetemi
d7c1249b6b Setup adjust 2014-09-08 00:06:13 +02:00
Dylan Geels
6a3d59f6f5 The setup was showing a error from it. 2014-09-07 13:18:32 +00:00
Dylan Geels
fc43595faf Function split() is deprecated 2014-09-07 13:06:24 +00:00
Dylan Geels
1a1aa68ebc Function split() is deprecated 
--HG--
branch : Geels/join_shardphp-edited-online-with-bitbuck-1410094877054
 2014-09-07 13:01:42 +00:00
botanic
d3606149e8 upgrade nel lib version 2014-09-07 05:41:35 -07:00
botanic
b89faeb75b Merge 2014-09-07 05:40:29 -07:00
botanic
6e0c7ef5ca setup modifications 2014-09-07 05:40:02 -07:00
botanic
3601eae39b Initial Domain Management Plugin 2014-09-07 05:39:48 -07:00
botanic
6a47cda484 added initial domain_management plugin, also fixed potental conflicting hook names 2014-09-07 03:17:20 -07:00
kaetemi
57564a8ab0 Cleanup shard table 2014-09-07 09:10:23 +02:00
kaetemi
b0c0439b39 Change ClientApplication to DomainId in permission table 2014-09-07 08:53:10 +02:00
kaetemi
00b394603d Cleanup some English AMS translations 2014-09-07 04:21:08 +02:00
kaetemi
70eb2d7bee Cleanup some English AMS translations 2014-09-07 04:16:07 +02:00
kaetemi
c938c18f35 Bugfix 2014-09-07 03:51:10 +02:00
kaetemi
aebcf606ed Bugfix 2014-09-07 03:47:55 +02:00
kaetemi
b4f4eddd12 Add login configuration 2014-09-07 03:43:00 +02:00
kaetemi
82d9103263 This might fix #193 2014-09-06 21:25:07 +02:00
kaetemi
500aa9fbfc Syntax styling 2014-09-06 20:59:21 +02:00
kaetemi
667fa78aab This should fix #193 2014-09-06 20:56:06 +02:00
botanic
83d9dc9f69 Merge 2014-09-05 22:24:41 -07:00
botanic
9211037a54 fix missing pcntl_fork func 2014-09-05 22:24:09 -07:00
kaetemi
6763d96992 Add more paranoia 2014-09-06 06:49:42 +02:00
kaetemi
67d5ec373e Now really, don't execute any scripts here 2014-09-06 06:40:33 +02:00
kaetemi
186da3c0fa Saner behaviour to show Forbidden error 2014-09-06 04:55:17 +02:00
kaetemi
d132e5ebb1 Add upgrade script 2014-09-06 04:44:08 +02:00
botanic
d34f884d32 fixed sync to be more robust 2014-09-05 19:38:53 -07:00
botanic
72711ab92e throw error on non-writable file 2014-09-05 19:26:12 -07:00
botanic
702320a0ce forgot $AMS_TMPDIR 2014-09-05 19:18:17 -07:00
botanic
cbabab3e80 Merge 2014-09-05 18:46:33 -07:00
botanic
afa6787100 Fix #189 2014-09-05 18:46:13 -07:00
kaetemi
3ee17121f9 Make files folder safe to use 2014-09-06 03:44:58 +02:00
kaetemi
1448007193 Make files folder safe to use 2014-09-06 03:43:31 +02:00
kaetemi
1cec88b78b Protect shard admin auth SQL queries 2014-09-06 01:40:37 +02:00
kaetemi
07eff64df5 Fix version number 2014-09-06 00:38:20 +02:00
kaetemi
17e921c8e4 Merge 2014-09-06 00:37:29 +02:00
kaetemi
9be5bfb5d7 Create shard admin user in setup 2014-09-06 00:35:28 +02:00
dfighter1985
46e3242557 Merged default. 
--HG--
branch : dfighter-tools
 2014-09-05 22:28:11 +02:00
dfighter1985
3a94909a92 Get type info from DFN. 
--HG--
branch : dfighter-tools
 2014-09-05 21:42:14 +02:00
dfighter1985
ff0df2bf50 Added support for manipulating atoms. 
--HG--
branch : dfighter-tools
 2014-09-05 20:28:43 +02:00
dfighter1985
b63f73b1b6 Appending, resizing arrays, deleting array members should now create the proper new nodes. 
--HG--
branch : dfighter-tools
 2014-09-05 19:41:51 +02:00
dfighter1985
6233c25461 Added support for adding atoms and virtual structs in the treeview. 
--HG--
branch : dfighter-tools
 2014-09-05 18:58:47 +02:00
kervala
ff370bb49f Changed: Code formatting 2014-09-05 15:42:53 +02:00
dfighter1985
0ac5d7c9ee Do the same when readding items after a deletion. 
--HG--
branch : dfighter-tools
 2014-09-05 15:20:22 +02:00
dfighter1985
683efde803 Add new array entries with all their children. 
--HG--
branch : dfighter-tools
 2014-09-05 15:13:58 +02:00
botanic
ea366fcce9 Merge 2014-09-05 02:31:56 -07:00
botanic
1908d6967c only show powered by and version when admin 2014-09-05 02:30:50 -07:00
botanic
884357c705 added version number to ams 2014-09-05 02:27:08 -07:00
kaetemi
1acf0bf3ca Merge 2014-09-05 11:22:47 +02:00
kaetemi
9163bf4afa Merge 2014-09-05 11:22:18 +02:00
kaetemi
98735ea86e Validate setup password 2014-09-05 11:21:21 +02:00
botanic
ab29777062 remove unecessery printing 2014-09-05 02:21:00 -07:00
botanic
72cfe723e1 fixed some caching 2014-09-05 02:17:19 -07:00
botanic
f27cd046a0 remove errolog 2014-09-05 02:10:32 -07:00
botanic
f46de3129e fix sync 2014-09-05 02:10:09 -07:00
kaetemi
fbee858ae9 Add basis for database upgrades 2014-09-05 11:07:25 +02:00
botanic
e99c43095e Made filesize friendly 2014-09-05 01:30:54 -07:00
botanic
5ae905d317 remove old file 2014-09-05 01:22:39 -07:00
botanic
bd442c9854 added placeholder 2014-09-05 01:22:19 -07:00
botanic
4293518dcf added placeholder 2014-09-05 01:21:59 -07:00
botanic
58be0a2b8e Merge 2014-09-05 01:20:39 -07:00
botanic
8a1a88d48c Fix #190 2014-09-05 01:20:00 -07:00
kaetemi
38a900d4f4 Alternative redirect script 2014-09-05 10:11:50 +02:00
kaetemi
e3a519fad8 Merge 2014-09-05 10:01:20 +02:00
kaetemi
8c57fb88ab Modularize web setup 2014-09-05 09:57:06 +02:00
botanic
147fa8f403 forgot to add variable 2014-09-05 00:52:38 -07:00
botanic
37be03d51c Fix #188 2014-09-05 00:50:07 -07:00
botanic
981e75dfdb added new ticket_attachment table to installer properly 2014-09-04 21:34:57 -07:00
botanic
bb7c5f147b fixed installer 2014-09-04 20:29:45 -07:00
botanic
2311731fae Upload button setup 
TODO: add files to database
TODO: hash folder to stick files in
 2014-09-04 19:58:04 -07:00
botanic
822d255aa7 Merge 2014-09-04 17:27:29 -07:00
botanic
4ae4c1a17d Fix #111 2014-09-04 17:26:22 -07:00
dfighter1985
8c9237a16f Enter a log entry when creating new documents. 
--HG--
branch : dfighter-tools
 2014-09-04 15:41:17 +02:00
dfighter1985
aba33c2406 Merged default. 
--HG--
branch : dfighter-tools
 2014-09-03 20:27:01 +02:00
dfighter1985
916810c35d Added support for creating new form documents 
--HG--
branch : dfighter-tools
 2014-09-03 19:55:46 +02:00
dfighter1985
37bbb6be32 Added support for new DFN document creation. 
--HG--
branch : dfighter-tools
 2014-09-03 19:37:49 +02:00
dfighter1985
ca127f756c Added support for new typ document creation. 
--HG--
branch : dfighter-tools
 2014-09-03 19:28:01 +02:00
dfighter1985
22d1fe0cbc Error messages 
--HG--
branch : dfighter-tools
 2014-09-03 19:14:32 +02:00
dfighter1985
84853839f8 A little refactoring, dialogs are now loaded using the full filepath. 
--HG--
branch : dfighter-tools
 2014-09-03 19:11:38 +02:00
dfighter1985
7206f060a7 Added GUI stub for new types/Dfns/forms. 
--HG--
branch : dfighter-tools
 2014-09-03 18:33:09 +02:00
dfighter1985
99e9a2ad76 Removed m_modified, since the base widget has a field for this. 
--HG--
branch : dfighter-tools
 2014-09-03 17:25:11 +02:00
dfighter1985
691edb41eb Form editor should trigger the save button properly now. 
--HG--
branch : dfighter-tools
 2014-09-03 17:22:09 +02:00
dfighter1985
7e66701cba Added missing copyright headers. 
--HG--
branch : dfighter-tools
 2014-09-03 17:12:25 +02:00
dfighter1985
b68b658f89 Log changes and save log. 
--HG--
branch : dfighter-tools
 2014-09-03 16:42:12 +02:00
dfighter1985
d289b7e030 Mark the typ dialog modified after a modification. 
--HG--
branch : dfighter-tools
 2014-09-03 16:26:52 +02:00
dfighter1985
2ee86da670 Apply changes. 
--HG--
branch : dfighter-tools
 2014-09-03 16:14:38 +02:00
dfighter1985
6e86da4c40 Load type data into the property browser. 
--HG--
branch : dfighter-tools
 2014-09-03 16:08:13 +02:00
botanic
71840e582a fix settings width 2014-09-03 05:27:38 -07:00
botanic
c968a95734 margins in element-style...really? 2014-09-03 05:05:21 -07:00
botanic
12ccb08de2 fix #185 2014-09-03 05:00:36 -07:00
botanic
071530251e Merge 2014-09-03 04:42:54 -07:00
botanic
9855aecc25 fix support group bug and dblayer bug 2014-09-03 04:42:28 -07:00
Matthew Lagoe
617b5f84f0 Merged in shubham_meena/ryzomcore (pull request #71) 
documentation for doxygen containing plugin management system
 2014-09-03 04:15:02 -07:00
botanic
f7d338bdf6 Fix syntax error with unassigned ticket 2014-09-03 04:13:44 -07:00
botanic
8e46cd7ab9 fixed language when logged in 2014-09-03 04:03:01 -07:00
botanic
f15d151fbd updated bootstrap and charisma 2014-09-03 03:22:14 -07:00
botanic
f21fa61d5f updating plugins 2014-09-03 01:28:27 -07:00
botanic
e373874bbf Fix path's in plugins 2014-09-03 01:13:08 -07:00
botanic
912a15c1bd fixed change email on shard 2014-09-03 00:23:47 -07:00
botanic
e2882d1b9f Changed to use new throw new SystemExit(); 2014-09-02 23:30:25 -07:00
botanic
fe8cb3595a Merge 2014-09-02 23:26:53 -07:00
botanic
ea9324bd51 Fix add user in settings 2014-09-02 23:24:41 -07:00
kaetemi
54435b9258 Crash workaround 2014-09-03 08:18:21 +02:00
kaetemi
7edf900a2e Remove bad data in sql 2014-09-03 07:38:24 +02:00
kaetemi
9c26f8e345 Don't cache redirects 2014-09-03 07:36:10 +02:00
kaetemi
41e0baca84 Throw exception instead of exit. 2014-09-03 07:23:39 +02:00
kaetemi
7a62843aee Merge 2014-09-03 07:07:55 +02:00
kaetemi
71302bf982 Die, don't exit 2014-09-03 07:06:43 +02:00
botanic
441ede1cad Merge 2014-09-02 21:40:10 -07:00
botanic
b081d97b3c Fix #181 2014-09-02 21:39:35 -07:00
kaetemi
d9dac55a28 Merge 2014-09-03 06:39:20 +02:00
kaetemi
f920da3873 Force all user ids equal 2014-09-03 06:38:38 +02:00
botanic
c13264c207 Fix #182 2014-09-02 21:32:48 -07:00
botanic
5c63089b0a Merge 2014-09-02 21:26:09 -07:00
botanic
5d6a38ec16 settings page display bug 2014-09-02 21:25:39 -07:00
kaetemi
2b2ffb8052 Transactions not required here either, actually 2014-09-03 06:16:41 +02:00
kaetemi
5954b96813 Merge 2014-09-03 06:08:08 +02:00
kaetemi
41385c3b8c Reduce unnecessary manual transaction commit 2014-09-03 06:07:02 +02:00
botanic
a533354df8 Merge 2014-09-02 21:04:22 -07:00
botanic
110b36dd4a missing ) 2014-09-02 21:03:51 -07:00
botanic
dee11a74c9 updated hgignore as well as fixed php errors 2014-09-02 20:55:51 -07:00
kaetemi
d4423d956f Disable connection cache workaround 2014-09-03 05:47:47 +02:00
kaetemi
a120179e75 Don't create transactions for SELECT queries 2014-09-03 05:39:16 +02:00
kaetemi
3ddf42f0ef Fix #180 2014-09-03 05:11:11 +02:00
kaetemi
04ef076448 Fix #180 2014-09-03 04:46:08 +02:00
kaetemi
978c09b029 Only make a single database connection per host, and keep them persistent 2014-09-03 03:51:11 +02:00
kaetemi
75c5232dcf Remove excessive javascript interactivity in AMS 2014-09-03 03:08:57 +02:00
kaetemi
340fae54ed Some more adjustments for DBLayer... 2014-09-03 03:08:22 +02:00
dfighter1985
6cd4d756db Mark the DFN editor modified after adding / removing an element. 
--HG--
branch : dfighter-tools
 2014-09-03 00:00:52 +02:00
dfighter1985
f587e06d7a Implemented saving. 
--HG--
branch : dfighter-tools
 2014-09-02 23:54:42 +02:00
dfighter1985
173dbba11c Implemented add button. 
--HG--
branch : dfighter-tools
 2014-09-02 23:37:16 +02:00
dfighter1985
a68dd4c33e Implemented definition editing. 
--HG--
branch : dfighter-tools
 2014-09-02 23:25:47 +02:00
dfighter1985
ec8a7522b2 Implemented remove button. 
--HG--
branch : dfighter-tools
 2014-09-02 23:07:55 +02:00
dfighter1985
73a2b9bc90 Load comments, log, and definitions. 
--HG--
branch : dfighter-tools
 2014-09-02 23:00:32 +02:00
dfighter1985
a69e09af6f Delete DFN when destroying a DFN editor... 
--HG--
branch : dfighter-tools
 2014-09-02 22:47:18 +02:00
dfighter1985
cfaebcc1ff Load .typ file. 
--HG--
branch : dfighter-tools
 2014-09-02 22:46:19 +02:00
dfighter1985
24a7cc4a6d Added GUI for the Type editor. 
--HG--
branch : dfighter-tools
 2014-09-02 22:32:56 +02:00
kaetemi
afe03367d9 Re-use the database connection 2014-09-02 20:39:07 +02:00
kaetemi
dfc65485ec Make login and email unique keys 2014-09-02 20:17:53 +02:00
dfighter1985
0b9c281b2f Logging DFN changes. 
--HG--
branch : dfighter-tools
 2014-09-02 20:13:10 +02:00
kaetemi
2bc60334c1 Remove invalid behaviour with ring databases 2014-09-02 19:56:37 +02:00
dfighter1985
e3d405454e No comment. Literally! :D 
--HG--
branch : dfighter-tools
 2014-09-02 19:32:05 +02:00
dfighter1985
c51b519845 Implemented add and remove buttons. 
--HG--
branch : dfighter-tools
 2014-09-02 19:26:02 +02:00
kaetemi
b64ab2c828 Move misleading copyright notices to a more appropriate location 2014-09-02 19:01:15 +02:00
kaetemi
75dc4fc779 Web services setup tool, fix #141 2014-09-02 18:34:09 +02:00
dfighter1985
ed1c600c4d Save changes. 
--HG--
branch : dfighter-tools
 2014-09-02 15:31:14 +02:00
dfighter1985
afc8aef238 Change the name in the list too. 
--HG--
branch : dfighter-tools
 2014-09-02 15:13:48 +02:00
dfighter1985
e2cb637a13 Enable saving when modified, disable saving after saving. 
--HG--
branch : dfighter-tools
 2014-09-02 15:11:28 +02:00
dfighter1985
f1a6a8d9cd Apply changes. 
--HG--
branch : dfighter-tools
 2014-09-02 14:54:07 +02:00
kaetemi
b500066026 Move SQL files 2014-09-02 14:36:31 +02:00
dfighter1985
25d808f7ea Added first iteration of the file path property manager / editor / factory. 
--HG--
branch : dfighter-tools
 2014-09-01 23:06:23 +02:00
dfighter1985
259dc63ac4 Use enum property manager for the type. 
--HG--
branch : dfighter-tools
 2014-08-31 23:21:19 +02:00
dfighter1985
e768506349 Load DFN. 
--HG--
branch : dfighter-tools
 2014-08-31 22:42:49 +02:00
dfighter1985
230159e2b6 Added common base class for Typ, Dfn, and From dialogs: GeorgesDockWidget. 
--HG--
branch : dfighter-tools
 2014-08-31 21:25:12 +02:00
dfighter1985
0a3d7d6355 Added GUI for DFN dialog. 
--HG--
branch : dfighter-tools
 2014-08-31 20:21:31 +02:00
dfighter1985
d232939294 Merged default 
--HG--
branch : dfighter-tools
 2014-08-30 23:02:14 +02:00
dfighter1985
cfabc13ffd EOL 
--HG--
branch : dfighter-tools
 2014-08-30 22:23:21 +02:00
dfighter1985
ad4771e3d1 Show an error message when form loading fails. 
--HG--
branch : dfighter-tools
 2014-08-30 21:37:11 +02:00
dfighter1985
0d530f15f6 Renamed signal. 
--HG--
branch : dfighter-tools
 2014-08-30 21:32:28 +02:00
kervala
3625818283 Fixed: EOL 2014-08-30 16:21:25 +02:00
kervala
687927ba10 Changed: Preserve attributes when copying files in Application Bundle 2014-08-30 16:20:36 +02:00
dfighter1985
58b50e7d7e Save the log too, when saving.. 
--HG--
branch : dfighter-tools
 2014-08-27 20:30:16 +02:00
dfighter1985
e6aa34584a Mark file modified even when using the context menu. 
--HG--
branch : dfighter-tools
 2014-08-27 20:25:30 +02:00
dfighter1985
0ae8fbde29 Implemented rename context menu. 
--HG--
branch : dfighter-tools
 2014-08-27 20:24:05 +02:00
dfighter1985
77a21cfc99 Now logging changes. 
--HG--
branch : dfighter-tools
 2014-08-27 19:22:10 +02:00
dfighter1985
3c0e76e78b Load log into the log tab. 
--HG--
branch : dfighter-tools
 2014-08-27 17:37:53 +02:00
dfighter1985
f0fdd41675 Don't disable the log tab! 
--HG--
branch : dfighter-tools
 2014-08-27 17:34:26 +02:00
dfighter1985
5bb3e16ca4 Implement 'delete array entry' context menu command. 
--HG--
branch : dfighter-tools
 2014-08-27 16:23:16 +02:00
kervala
f57380f19b Changed: Including malloc/malloc.h is useless 2014-08-27 11:21:47 +02:00
kervala
bb324e80b4 Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X) 2014-08-27 11:19:20 +02:00
kervala
8d3ea38ffc Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist) 2014-08-27 11:16:30 +02:00
dfighter1985
6fb9c35d84 Implemented 'append array entry' context menu 
--HG--
branch : dfighter-tools
 2014-08-27 01:14:49 +02:00
kaetemi
4402e2134c Remove warnings, ref #177 2014-08-26 13:48:34 +02:00
kaetemi
031cd3b68d Adjust casts, ref #177 2014-08-26 13:33:18 +02:00
kaetemi
2a27139594 Inventory bug workaround, ref #177 2014-08-25 15:32:00 +02:00
kaetemi
573fb44088 Link group_wheel.cpp, ref #176 2014-08-25 14:56:29 +02:00
dfighter1985
d593ef5d17 Crash fixes related to Georges array size changing. 
--HG--
branch : dfighter-tools
 2014-08-20 23:36:53 +02:00
dfighter1985
eeac53ebba Added support for creating arrays. 
--HG--
branch : dfighter-tools
 2014-08-20 23:18:16 +02:00
dfighter1985
d046a970d9 Initialize CFormItem fields... 
--HG--
branch : dfighter-tools
 2014-08-20 19:57:16 +02:00
dfighter1985
655d446151 When reaching 0 array size, delete the array node. 
--HG--
branch : dfighter-tools
 2014-08-20 18:22:20 +02:00
kaetemi
da5558d50a Merge with default 
--HG--
branch : multipass-stereo
 2014-08-19 15:43:49 +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
9b6ff808c5 Save from the file menu too. 
--HG--
branch : dfighter-tools
 2014-08-19 01:57:20 +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
772245a3e6 Merge with default 
--HG--
branch : multipass-stereo
 2014-08-16 15:05:32 +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
kaetemi
993f2ffab7 Snowballs update 
--HG--
branch : multipass-stereo
 2014-08-12 21:11:55 +02:00
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
kaetemi
93376226c4 Use software cursor with attached display 
--HG--
branch : multipass-stereo
 2014-08-07 19:45:26 +02:00
kaetemi
38abf2193f Project client loading screens into 3D space for HMD 
--HG--
branch : multipass-stereo
 2014-08-07 18:49:05 +02:00
kaetemi
38a418503d Non-functional direct to rift 
--HG--
branch : multipass-stereo
 2014-08-07 05:09:11 +02:00
kaetemi
aff0cab54e GL: Fix switch from different resolution fullscreen to borderless display 
--HG--
branch : multipass-stereo
 2014-08-07 04:45:14 +02:00
kaetemi
e2bfb5d542 Clean handling of display mode switching in client 
--HG--
branch : multipass-stereo
 2014-08-07 04:36:51 +02:00
kaetemi
400f479fe1 GL: Handle borderless fullscreen to specified monitor internally 
--HG--
branch : multipass-stereo
 2014-08-07 04:18:17 +02:00
kaetemi
7c39f7d33b Specify monitor when changing display mode 
--HG--
branch : multipass-stereo
 2014-08-07 01:04:58 +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
kaetemi
4e33e5cf2f Process some scene traversals only once when rendering in stereo 
--HG--
branch : multipass-stereo
 2014-08-06 14:36:09 +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
kaetemi
e8a245a133 OVR: Chroma factor 
--HG--
branch : multipass-stereo
 2014-08-05 20:14:58 +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
kaetemi
e61eb57fd9 OVR: Fix for debug devices 
--HG--
branch : multipass-stereo
 2014-08-05 04:03:27 +02:00
kaetemi
3fd358d69d OVR: Convert texture coordinates and setup rendering material 
--HG--
branch : multipass-stereo
 2014-08-05 03:54:19 +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
kaetemi
102d3653d7 3D: Ensure correct fog handling for effects 
--HG--
branch : multipass-stereo
 2014-08-05 02:58:55 +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
kaetemi
6ad1d14617 OVR: Test distortion mesh 
--HG--
branch : multipass-stereo
 2014-08-05 02:55:26 +02:00
kaetemi
65578ce498 OVR: Test large render target 
--HG--
branch : multipass-stereo
 2014-08-05 02:25:14 +02:00
kaetemi
2fbf1cb06d 3D: Set matrix modes after changing render target in effect 
--HG--
branch : multipass-stereo
 2014-08-05 02:24:11 +02:00
kaetemi
339c8b8dfa 3D: Render target matrix context fix 
--HG--
branch : multipass-stereo
 2014-08-05 02:21:30 +02:00
kaetemi
33235bdf6c OVR: Testing 
--HG--
branch : multipass-stereo
 2014-08-05 01:49:45 +02:00
kaetemi
2e6893fd48 OVR: Translate camera 
--HG--
branch : multipass-stereo
 2014-08-05 00:51:53 +02:00
kaetemi
9b79a44f8a OVR: Get orientation 
--HG--
branch : multipass-stereo
 2014-08-05 00:46:04 +02:00
kaetemi
262c1f84a9 OVR: Generate distortion mesh 
--HG--
branch : multipass-stereo
 2014-08-05 00:20:21 +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
kaetemi
99ea2c685c OVR: Read device descriptions 
--HG--
branch : multipass-stereo
 2014-08-04 20:32:31 +02:00
kaetemi
f2274d2378 OVR: Iterate devices 
--HG--
branch : multipass-stereo
 2014-08-04 19:19:15 +02:00
kaetemi
b9e10fca72 Cleanup 
--HG--
branch : multipass-stereo
 2014-08-04 18:31:31 +02:00
kaetemi
0488b706b2 Add placeholders for LibOVR 0.4.0 support 
--HG--
branch : multipass-stereo
 2014-08-04 18:30:25 +02:00
shubham_meena
204a5b8a18 rest api using curl 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-08-04 14:05:11 +05:30
kaetemi
96bd17ae63 3D: Fix texture coords for FXAA on D3D 
--HG--
branch : multipass-stereo
 2014-08-04 07:38:40 +02:00
kaetemi
1a413b0fe3 Add FXAA to Ryzom Client 
--HG--
branch : multipass-stereo
 2014-08-04 06:19:19 +02:00
kaetemi
d56047bde6 Remove debug 
--HG--
branch : multipass-stereo
 2014-08-04 06:19:03 +02:00
kaetemi
8a283ea518 3D: User higher quality FXAA version 
--HG--
branch : multipass-stereo
 2014-08-04 06:11:47 +02:00
kaetemi
fb525e3911 Cleanup snowballs2 
--HG--
branch : multipass-stereo
 2014-08-04 05:24:40 +02:00
kaetemi
ec4762f669 3D: Add FXAA 
--HG--
branch : multipass-stereo
 2014-08-04 04:44:27 +02:00
kaetemi
f59de199cf Fix crash on AMD with legacy clouds 
--HG--
branch : multipass-stereo
 2014-08-04 01:05:53 +02:00
kaetemi
d98f1ede47 Move default render target handling to CDriverUser 
--HG--
branch : multipass-stereo
 2014-08-04 00:57:43 +02:00
kaetemi
e88dedf00c Adjust render target handling for effects 
--HG--
branch : multipass-stereo
 2014-08-03 22:15:44 +02:00
kaetemi
6c3bcc2439 Merge with default 
--HG--
branch : multipass-stereo
 2014-08-03 22:15:39 +02:00
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
kaetemi
6a21d0503c 3D: Cleanup bloom effect 
--HG--
branch : multipass-stereo
 2014-08-03 21:09:55 +02:00
kaetemi
8af686f7ef 3D: Cleanup bloom effect 
--HG--
branch : multipass-stereo
 2014-08-03 20:35:05 +02:00
dfighter1985
299629860b Rotation can now be set. 
--HG--
branch : gsoc2014-dfighter
 2014-08-03 19:04:34 +02:00
kaetemi
78ce8f4f25 GL: Share depth and stencil to get similar behaviour to D3D driver 
--HG--
branch : multipass-stereo
 2014-08-03 18:59:19 +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
kaetemi
503292065c Simplify GUI projection settings 
--HG--
branch : multipass-stereo
 2014-08-03 00:56:26 +02:00
kaetemi
1965d46dce Off-center GUI cylinder 
--HG--
branch : multipass-stereo
 2014-08-02 20:11:28 +02:00
kaetemi
f2dd6083fa Cylindrical GUI 
--HG--
branch : multipass-stereo
 2014-08-02 19:50:26 +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
kaetemi
e4e1e3e5a1 Sound orientation with HMD and Headphones 
--HG--
branch : multipass-stereo
 2014-08-01 23:11:35 +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
kaetemi
c11706feb8 Project GUI into space 
--HG--
branch : multipass-stereo
 2014-08-01 15:44:12 +02:00
kaetemi
f32c3bf6b0 Temporary crashfix, ref #68 
--HG--
branch : multipass-stereo
 2014-08-01 15:23:13 +02:00
kaetemi
caefb04928 Restore camera and scene viewport after disabling VR 
--HG--
branch : multipass-stereo
 2014-08-01 13:20:55 +02:00
shubham_meena
ce53f5f26c API key management calender 
--HG--
branch : Gsoc14-ryzomAppImprovements
 2014-08-01 16:01:35 +05:30
kaetemi
c70d8597b2 Merge with default 
--HG--
branch : multipass-stereo
 2014-08-01 11:50:40 +02:00
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
kaetemi
79c6f50054 Render target format (for alpha) 
--HG--
branch : multipass-stereo
 2014-07-31 18:25:50 +02:00
kaetemi
61f97fae40 Fix issue with render target in OpenGL when size not specified 
--HG--
branch : multipass-stereo
 2014-07-31 17:41:56 +02:00
kaetemi
22d03c5f79 Mode2D selection 
--HG--
branch : multipass-stereo
 2014-07-31 03:53:38 +02:00
kaetemi
dac5b2d274 Merge with game-device 
--HG--
branch : multipass-stereo
 2014-07-31 02:07:20 +02:00
kaetemi
b1e2b60381 Add render target manager, issue #47 
--HG--
branch : multipass-stereo
 2014-07-31 00:46:00 +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
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
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
dfighter1985
f66c1e837e Connect the selection model so the widgets are updated. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 18:39:34 +02:00
dfighter1985
9b403212c0 Each land has it's own TilesetModel now. When changing the land the model also changes. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 18:31:07 +02:00
dfighter1985
947782a2c5 Implemented land name changing. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 16:25:28 +02:00
dfighter1985
9519c4f0f5 Implemented land removal. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 16:20:44 +02:00
dfighter1985
02ccd3b1c1 Implemented land adding. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 16:18:01 +02:00
dfighter1985
e9e42701b9 Renamed land related widgets. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 16:09:58 +02:00
dfighter1985
c7ca20c748 Implemented tileset move up and move down. 
--HG--
branch : gsoc2014-dfighter
 2014-07-24 02:28:19 +02:00
dfighter1985
9d1fec6ce1 Implemented tileset rename. 
--HG--
branch : gsoc2014-dfighter
 2014-07-23 21:53:09 +02:00
dfighter1985
71fc4a098b Implemented tileset removal. 
--HG--
branch : gsoc2014-dfighter
 2014-07-23 18:35:26 +02:00
dfighter1985
5301b00e58 Don't try to delete the same items more than once! 
--HG--
branch : gsoc2014-dfighter
 2014-07-22 15:38:26 +02:00
dfighter1985
4d6de3f737 Don't allow 2 tilesets to have the same name. 
--HG--
branch : gsoc2014-dfighter
 2014-07-22 15:35:14 +02:00
dfighter1985
dcc072ba18 Update qrc location. 
--HG--
branch : gsoc2014-dfighter
 2014-07-22 14:44:31 +02:00
dfighter1985
8373118c7e Merged default. 
--HG--
branch : gsoc2014-dfighter
 2014-07-22 00:15:50 +02:00
dfighter1985
3940e656e3 Error message when files can't be opened. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 23:25:35 +02:00
dfighter1985
32172e0e77 Added save and save as items to the context menu. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 23:08:05 +02:00
dfighter1985
ed44cc4823 Shouldn't crash when adding a new row. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 17:46:01 +02:00
dfighter1985
26b120f664 Mark translated item with green, untranslated ones with red. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 04:11:53 +02:00
dfighter1985
e92a07db33 New context menu options: mark / unmark translated. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 03:51:03 +02:00
dfighter1985
2fea6f45f5 Make sure a correct hash is not used for untranslated strings. 
--HG--
branch : gsoc2014-dfighter
 2014-07-21 03:24:18 +02:00
dfighter1985
0bd4b56589 Save to the right file. 
--HG--
branch : gsoc2014-dfighter
 2014-07-20 20:03:16 +02:00
dfighter1985
76d3e0df20 Set header text according to the language. 
--HG--
branch : gsoc2014-dfighter
 2014-07-20 19:52:23 +02:00
dfighter1985
2c812e90ab Work with translated files, instead of work files. 
--HG--
branch : gsoc2014-dfighter
 2014-07-20 17:24:04 +02:00
dfighter1985
fbcfa4ee6f Ask for confirmation before deleting a row. 
--HG--
branch : gsoc2014-dfighter
 2014-07-19 17:26:59 +02:00
dfighter1985
62a6b408a2 Show insert / delete row in context menu. 
--HG--
branch : gsoc2014-dfighter
 2014-07-19 17:23:53 +02:00
kervala
38f79138b9 Changed: Determinates 3dsmax SDK base directory 2014-07-19 14:04:19 +02:00
kervala
1ace2090fb Fixed: Give priority to fmod64 in 64 bits 2014-07-19 14:03:22 +02:00
kervala
9b600a154d Fixed: Initialization of pointers in constructor 2014-07-19 14:02:43 +02:00
kervala
4b39f9640d Changed: Minor optimization and warning 2014-07-19 14:01:44 +02:00
kervala
0bb464411b Changed: Replaced tests with .size() by .empty() because faster 2014-07-19 14:01:03 +02:00
kervala
49c53955a6 Fixed: Some typos 2014-07-19 13:59:54 +02:00
kervala
23b73eff1d Changed: Minor change 2014-07-19 11:24:07 +02:00
kervala
3fb0dfe0c2 Changed: Some Big endian swaps (for PowerPC especially) 2014-07-19 11:23:49 +02:00
kervala
42eeb9ad59 Fixed: Use UTF-8 for French translations 
Changed: Improved some translations (more to come)
 2014-07-19 11:19:34 +02:00
kervala
c1ea3820d5 Fixed: Warning 2014-07-19 11:16:43 +02:00
kervala
8d2db7bc85 Changed: Replaced atof by NLMISC::fromString 2014-07-19 11:14:38 +02:00
dfighter1985
d9c2620e6e Implemented row deletion / insertion. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 01:52:23 +02:00
dfighter1985
485ee77406 Use the QWidget modified property instead of the UXTEditor's own. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 01:18:41 +02:00
dfighter1985
3e188334fe Allow only 1 instance of the uxt editor. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 01:08:31 +02:00
dfighter1985
9bda0bd1e7 Added copyright headers to the new files. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 00:53:36 +02:00
dfighter1985
05216897f0 Implemented saving. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 00:50:40 +02:00
dfighter1985
fbc1632d04 Apply table changes to the loaded data, and offer to save when closing the changed table. 
--HG--
branch : gsoc2014-dfighter
 2014-07-18 00:27:05 +02:00
dfighter1985
0de5152aa9 Set header texts. 
--HG--
branch : gsoc2014-dfighter
 2014-07-17 19:17:02 +02:00
dfighter1985
d33fb9345e UXT Editor widget 
--HG--
branch : gsoc2014-dfighter
 2014-07-17 19:08:29 +02:00
KISHAN GRIMOUT
b9dc8ace7e 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
f724d13700 Fix #71 2014-07-28 22:16:41 +02:00
kaetemi
5930d3b384 Backed out changeset: 7bdb27443f88 2014-07-28 22:15:09 +02:00
kaetemi
12aa02585f Fix self illumination color widget in NeL Material script 2014-07-28 18:32:05 +02:00
kaetemi
3b4e1a32cb Fix NeL Material script defaults, fix #166 2014-07-28 18:31:40 +02:00
kaetemi
6e3827928b Adjust 3ds Max plugin versioning info 2014-07-28 18:31:20 +02:00
dfighter1985
f60f761b7a I don't really know what to write here. 
--HG--
branch : gsoc2014-dfighter
 2014-07-16 02:52:17 +02:00
dfighter1985
28c30b70f1 Set the undostack so we won't crash... 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 21:46:16 +02:00
dfighter1985
d30e9ad226 Initialize the undostack to NULL, so we get a proper crash instead of a dangled pointer crash. 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 21:41:11 +02:00
dfighter1985
63b6a03f85 Fixed another crash. 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 20:29:57 +02:00
dfighter1985
1cbcca259c 'Fixed' the Mission Compiler crash. 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 20:19:53 +02:00
dfighter1985
56a4c3ea7d When changing a property make sure to set default to false, so it's actually saved! 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 18:51:06 +02:00
kaetemi
ca4c302c6a Disable WG specifics in r2_login script 2014-07-15 15:25:09 +02:00
dfighter1985
61b8a4ef82 Save world editor files. 
--HG--
branch : gsoc2014-dfighter
 2014-07-15 01:30:30 +02:00
kaetemi
3f5eedf040 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
aca4d8e48b One set of SQL scripts to rule them all 2014-07-14 19:15:23 +02:00
dfighter1985
2d865a8567 Trying to load an invalid world editor file shouldn't crash the application, and an error messagebox should inform the user. 
--HG--
branch : gsoc2014-dfighter
 2014-07-13 21:38:14 +02:00
kaetemi
176c3d8a4a Add callback template class 
--HG--
branch : develop
 2014-07-12 18:19:25 +02:00
kaetemi
fff4edb2c9 Maybe solves #210 
--HG--
branch : develop
 2014-10-16 02:00:53 +02:00
kaetemi
7487ea4135 Higher quality outline, visual difference is relevant only for black 
--HG--
branch : develop
 2014-10-16 02:00:45 +02:00
Laszlo Kis-Adam
03af2ed463 Merged in dfighter1985/ryzomcore/dfighter-tools (pull request #94) 
Just too lazy to push directly

--HG--
branch : develop
 2014-10-15 19:48:23 +02:00
kaetemi
b010f224e4 Don't use I18N when the required ui prefix is not in the tooltip text (convention actually dictates uitt as tooltip prefix) 
--HG--
branch : develop
 2014-10-14 23:45:08 +02:00
kaetemi
07a57f81f8 Shadow should not be taken into account for font height, breaks vertical centering 
--HG--
branch : develop
 2014-10-14 23:45:08 +02:00
kaetemi
7200d17801 HID: Adjust free look 
--HG--
branch : game-device
 2014-07-12 17:47:00 +02:00
kaetemi
496f7f268c Trash DirectInput 
--HG--
branch : game-device
 2014-07-12 17:17:24 +02:00
dfighter1985
3517283526 Apply property changes. 
--HG--
branch : gsoc2014-dfighter
 2014-07-12 01:54:45 +02:00
dfighter1985
3ad5ffee15 Block only the propertychanged signal in the const_string_array property manager. 
--HG--
branch : gsoc2014-dfighter
 2014-07-12 00:38:35 +02:00
dfighter1985
8f8b4fae65 Store QtProperty, IPrimitive pairs and look the primitive up when the property changes. 
--HG--
branch : gsoc2014-dfighter
 2014-07-12 00:01:17 +02:00
dfighter1985
820b6bc8ca Changed property to p, property is a reserved word in VS. 
--HG--
branch : gsoc2014-dfighter
 2014-07-11 20:47:24 +02:00
dfighter1985
aa82655ee7 Use \n instead of ; as a separator. 
--HG--
branch : gsoc2014-dfighter
 2014-07-11 20:41:15 +02:00