Commit Graph

5220 Commits (642ae4208e027048123617cf96ee8e9824bc461e)

Author SHA1 Message Date
dfighter1985 eb0693cd27 Add serial number to nodes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 99ebe16c03 Allow painting of arbitrary number of connection slots.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 40b4bce729 A little refactoring.
--HG--
branch : dfighter-tools
10 years ago
kaetemi adb717052a Add cartographer
--HG--
branch : develop
10 years ago
dfighter1985 42cd76c768 Support for adding nodes with different slot count.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 aa67011381 Added unlinking support.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 875cad3f72 Improved linking
--HG--
branch : dfighter-tools
10 years ago
kaetemi b5a95d725b Add pz process
--HG--
branch : develop
10 years ago
dfighter1985 2e6a5bb1d6 There are more than 1 slots available now.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 275095107b More refactoring.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 5fc392623b More refactoring.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 c63f22fe92 Refactoring
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 4cf4440a97 Connection slots are now managed by their own object, and linking is now done to their positions.
--HG--
branch : dfighter-tools
10 years ago
botanic 07933bf52c Update smarty for admin to 2.6.28
--HG--
branch : develop
10 years ago
dfighter1985 7c930366de Paint the connection text, boxes separately.
--HG--
branch : dfighter-tools
10 years ago
botanic 53ea877a50 update lib sql version
--HG--
branch : develop
10 years ago
botanic 3c01c5c811 disable debug mode
--HG--
branch : develop
10 years ago
botanic 9be68e3326 Merge
--HG--
branch : develop
10 years ago
botanic 9b813a5e4c Fix #122
--HG--
branch : develop
10 years ago
botanic 765e614c23 Fix #122
--HG--
branch : develop
10 years ago
dfighter1985 aef69eef64 Add a little style.
--HG--
branch : dfighter-tools
10 years ago
kaetemi 433d83e2fc Increase texturing limits (*4), ref #203 (TODO: Update config translations)
--HG--
branch : develop
10 years ago
kaetemi 7fed632c54 Fix includes
--HG--
branch : develop
10 years ago
kaetemi 9678b56ed5 Fix strange code
--HG--
branch : develop
10 years ago
dfighter1985 af550acd62 Throw an error message when trying to link nodes that are already linked.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 d2c396bc84 Link nodes and remove and delete the link too when deleting one of the nodes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 adece7564a Subclassed QGraphicsItem and QGraphicsItemLine.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 83566116d9 Added link action.
--HG--
branch : dfighter-tools
10 years ago
kaetemi 6bb136dca9 Change cfg name
--HG--
branch : develop
10 years ago
kaetemi 07ee9a4469 Add missing r2_islands_textures tool
--HG--
branch : develop
10 years ago
dfighter1985 e2ea5a74b8 We can select multiple items
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 cc7e93c96e Added GUI for expression editor.
--HG--
branch : dfighter-tools
10 years ago
kaetemi d12ccf194e Merge with develop
--HG--
branch : multipass-stereo
10 years ago
kaetemi e347b2a97f ryzomcore/v0.10.0 10 years ago
kaetemi 9fd8338849 Add data_common to executables_dev batch 10 years ago
kaetemi 8a3994d95a Replace some hardcoded urls 10 years ago
kaetemi 50f05a2bb9 Remove hardcoded urls 10 years ago
kaetemi 927ecb3dae Remove dead code (CCharacterAchievements, CKnownBrickInfo) 10 years ago
botanic dcd09e034b Merge 10 years ago
botanic 92afe8e76a FIX #200
dont crash when neldb is missing
10 years ago
kaetemi 2abe431675 Regenerate PLR cpp and header 10 years ago
kaetemi 14fda8a39a Add missing leaf 10 years ago
kaetemi 47368e78f9 Remove dead code 10 years ago
kaetemi 0d7c9fd4bf When in Rome, do as the Romans do 10 years ago
kaetemi 6b2b633fed Merge 10 years ago
kaetemi a9ee3c6b37 Admin web fix 10 years ago
kaetemi 1bf482adc9 Small database adjustment 10 years ago
dfighter1985 1ca2b634ee Merged default.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 52963260a8 Offer to save changes when closing a dialog.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 09ccd8613d When closing a dialog, remove it from the docked dialogs, and delete it.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 97d7fbe6e8 Allow editing of the comment section, and save comments when saving.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 104506a717 Raise the widget after adding.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 78a65459f0 WTF?
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 7abd407bc5 oups
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 1d028c759c Use a file browser for setting files.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 946685dfac A little refactoring
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 c44d910434 Store the filename only in the Dfn value.
--HG--
branch : dfighter-tools
10 years ago
kaetemi fceb2927f4 Add script for installing worldedit data 10 years ago
dfighter1985 e89cde4b93 Properly support color types.
--HG--
branch : dfighter-tools
10 years ago
kaetemi d03c2dcfcd Nice try 10 years ago
nimetu 1a4c2169c5 Fix #161 fix craft success rate display on client 10 years ago
nimetu ca79af60c6 Fix #143 /muteUniverse on dyn universe channels 10 years ago
nimetu 0cd3ea8d3b Fix #199 Studio object viewer plugin font 10 years ago
kaetemi 9e74156181 Move islands entry points to data 10 years ago
kaetemi f5fb98764f Remove unused mirror dataset 10 years ago
kaetemi 22fc641666 Merge 10 years ago
kaetemi 89db6c78a7 Use the correct ring database 10 years ago
botanic cafe41fa24 FIX #192 10 years ago
botanic 74df36b179 FIX #197
Added default config values that should work for mail config settings in case people are lazy
10 years ago
botanic dfdd7698c3 fix windows warnings in sync 10 years ago
dfighter1985 0587d6a687 Create vstruct node when needed.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 e47d480170 Instead of storing the node, store the name and the node type.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 53357ca9ec Don't add Virtual Structs to the property browser!
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 821ec6cfad Added support for Virtual Structs.
--HG--
branch : dfighter-tools
10 years ago
kaetemi 328eaf592a Use correct AES cfg 10 years ago
kaetemi 55ca1e7a2a Crashfix 10 years ago
kaetemi 7c40248728 Bugfix 10 years ago
kaetemi 0445c3138c Typo 10 years ago
kaetemi a8f8fa7b63 Don't use magic numbers for the LCT 10 years ago
kaetemi ea9cf3db93 Typo 10 years ago
kaetemi f0ac4705d8 Cleanup the AMS theme a bit, improve layouting of user settings 10 years ago
kaetemi d863ed8a10 Mask database connection error 10 years ago
kaetemi 7cd21d48b4 Merge 10 years ago
botanic 6a36f1f433 fix sync 10 years ago
kaetemi be78a1cd0b Cache PDO connections and connection failures in a single page load 10 years ago
kaetemi c4d4587830 Disable APC page caching 10 years ago
botanic e1c70eb423 dont cache $#1t 10 years ago
botanic 0b579f6306 attachment error checking 10 years ago
botanic efadbb3f58 make the random generation more secure 10 years ago
botanic 6f1037f829 fix some unset warnings 10 years ago
botanic 2a8ff51169 change some div's so it looks proper 10 years ago
botanic 8be65ec64c turn debugging off 10 years ago
botanic 32745a132b properly display permissions 10 years ago
botanic 4f907c30e6 display the correct plugin page 10 years ago
botanic 7fc83ccd37 set template permissions 10 years ago
botanic b20008b520 fix menu plugin display 10 years ago
botanic c3c319944c fix notice 10 years ago
botanic 76dc593a1c fix plugin template 10 years ago
botanic 8d49355c9f fix index issue 10 years ago
botanic 4009772907 Fix smarty issues 10 years ago
botanic 371f666dea Cleanup Domain management code 10 years ago
botanic 1b9986063e Merge 10 years ago
botanic b58f365473 upgrade smarty to 3.1.19 10 years ago
botanic 52885f20e0 Fix for stupid loop 10 years ago
kaetemi 3e476a9376 Install fix 10 years ago
kaetemi d651eff10b Cleanup some RYZOMID code 10 years ago
kaetemi 3baf60ad1d Remove dead code in game item manager 10 years ago
kaetemi e0a1d27dc8 Bugfix in distance prioritizer 10 years ago
botanic ab06a6ce08 remove testing errorlog 10 years ago
kaetemi 4dda4099de Remove dead code 10 years ago
botanic 4ff51bf600 Merge 10 years ago
botanic 876afdf018 Domain management plugin updates 10 years ago
kaetemi 034c5d7982 Better use this 10 years ago
kaetemi 6031e8666d Enable PHP APC cache for AMS smarty 10 years ago
kaetemi 7448ec51a7 Remove dead declarations in DSS 10 years ago
kaetemi bde283e8cb Fix SU RSM UAP SQL query 10 years ago
kaetemi af1b9ed495 Make this extra clear 10 years ago
kaetemi c902392de3 Enable ring database installation and upgrade in the setup script... 10 years ago
kaetemi 01735e86ad Translation fix 10 years ago
kaetemi 58d2c8be86 Adjust plugin description 10 years ago
kaetemi 8a875b3bab Don't put fixed row id's in insert queries for upgrades 10 years ago
kaetemi 5ec2db090d Bugfix 10 years ago
kaetemi 795b5a9aa0 Don't write version if upgrade failed 10 years ago
kaetemi fed7dc17ac Bugfix 10 years ago
kaetemi ed0f753fa9 Fix 10 years ago
kaetemi f4956721ff Typo 10 years ago
kaetemi d7c1249b6b Setup adjust 10 years ago
Dylan Geels 6a3d59f6f5 The setup was showing a error from it. 10 years ago
Dylan Geels fc43595faf Function split() is deprecated 10 years ago
Dylan Geels 1a1aa68ebc Function split() is deprecated
--HG--
branch : Geels/join_shardphp-edited-online-with-bitbuck-1410094877054
10 years ago
botanic d3606149e8 upgrade nel lib version 10 years ago
botanic b89faeb75b Merge 10 years ago
botanic 6e0c7ef5ca setup modifications 10 years ago
botanic 3601eae39b Initial Domain Management Plugin 10 years ago
botanic 6a47cda484 added initial domain_management plugin, also fixed potental conflicting hook names 10 years ago
kaetemi 57564a8ab0 Cleanup shard table 10 years ago
kaetemi b0c0439b39 Change ClientApplication to DomainId in permission table 10 years ago
kaetemi 00b394603d Cleanup some English AMS translations 10 years ago
kaetemi 70eb2d7bee Cleanup some English AMS translations 10 years ago
kaetemi c938c18f35 Bugfix 10 years ago
kaetemi aebcf606ed Bugfix 10 years ago
kaetemi b4f4eddd12 Add login configuration 10 years ago
kaetemi 82d9103263 This might fix #193 10 years ago
kaetemi 500aa9fbfc Syntax styling 10 years ago
kaetemi 667fa78aab This should fix #193 10 years ago
botanic 83d9dc9f69 Merge 10 years ago
botanic 9211037a54 fix missing pcntl_fork func 10 years ago
kaetemi 6763d96992 Add more paranoia 10 years ago
kaetemi 67d5ec373e Now really, don't execute any scripts here 10 years ago
kaetemi 186da3c0fa Saner behaviour to show Forbidden error 10 years ago
kaetemi d132e5ebb1 Add upgrade script 10 years ago
botanic d34f884d32 fixed sync to be more robust 10 years ago
botanic 72711ab92e throw error on non-writable file 10 years ago
botanic 702320a0ce forgot $AMS_TMPDIR 10 years ago
botanic cbabab3e80 Merge 10 years ago
botanic afa6787100 Fix #189 10 years ago
kaetemi 3ee17121f9 Make files folder safe to use 10 years ago
kaetemi 1448007193 Make files folder safe to use 10 years ago
kaetemi 1cec88b78b Protect shard admin auth SQL queries 10 years ago
kaetemi 07eff64df5 Fix version number 10 years ago
kaetemi 17e921c8e4 Merge 10 years ago
kaetemi 9be5bfb5d7 Create shard admin user in setup 10 years ago
dfighter1985 46e3242557 Merged default.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 3a94909a92 Get type info from DFN.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 ff0df2bf50 Added support for manipulating atoms.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 b63f73b1b6 Appending, resizing arrays, deleting array members should now create the proper new nodes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 6233c25461 Added support for adding atoms and virtual structs in the treeview.
--HG--
branch : dfighter-tools
10 years ago
kervala ff370bb49f Changed: Code formatting 10 years ago
dfighter1985 0ac5d7c9ee Do the same when readding items after a deletion.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 683efde803 Add new array entries with all their children.
--HG--
branch : dfighter-tools
10 years ago
botanic ea366fcce9 Merge 10 years ago
botanic 1908d6967c only show powered by and version when admin 10 years ago
botanic 884357c705 added version number to ams 10 years ago
kaetemi 1acf0bf3ca Merge 10 years ago
kaetemi 9163bf4afa Merge 10 years ago
kaetemi 98735ea86e Validate setup password 10 years ago
botanic ab29777062 remove unecessery printing 10 years ago
botanic 72cfe723e1 fixed some caching 10 years ago
botanic f27cd046a0 remove errolog 10 years ago
botanic f46de3129e fix sync 10 years ago
kaetemi fbee858ae9 Add basis for database upgrades 10 years ago
botanic e99c43095e Made filesize friendly 10 years ago
botanic 5ae905d317 remove old file 10 years ago
botanic bd442c9854 added placeholder 10 years ago
botanic 4293518dcf added placeholder 10 years ago
botanic 58be0a2b8e Merge 10 years ago
botanic 8a1a88d48c Fix #190 10 years ago
kaetemi 38a900d4f4 Alternative redirect script 10 years ago
kaetemi e3a519fad8 Merge 10 years ago
kaetemi 8c57fb88ab Modularize web setup 10 years ago
botanic 147fa8f403 forgot to add variable 10 years ago
botanic 37be03d51c Fix #188 10 years ago
botanic 981e75dfdb added new ticket_attachment table to installer properly 10 years ago
botanic bb7c5f147b fixed installer 10 years ago
botanic 2311731fae Upload button setup
TODO: add files to database
TODO: hash folder to stick files in
10 years ago
botanic 822d255aa7 Merge 10 years ago
botanic 4ae4c1a17d Fix #111 10 years ago
dfighter1985 8c9237a16f Enter a log entry when creating new documents.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 aba33c2406 Merged default.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 916810c35d Added support for creating new form documents
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 37bbb6be32 Added support for new DFN document creation.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 ca127f756c Added support for new typ document creation.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 22d1fe0cbc Error messages
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 84853839f8 A little refactoring, dialogs are now loaded using the full filepath.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 7206f060a7 Added GUI stub for new types/Dfns/forms.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 99e9a2ad76 Removed m_modified, since the base widget has a field for this.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 691edb41eb Form editor should trigger the save button properly now.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 7e66701cba Added missing copyright headers.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 b68b658f89 Log changes and save log.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 d289b7e030 Mark the typ dialog modified after a modification.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 2ee86da670 Apply changes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 6e86da4c40 Load type data into the property browser.
--HG--
branch : dfighter-tools
10 years ago
botanic 71840e582a fix settings width 10 years ago
botanic c968a95734 margins in element-style...really? 10 years ago
botanic 12ccb08de2 fix #185 10 years ago
botanic 071530251e Merge 10 years ago
botanic 9855aecc25 fix support group bug and dblayer bug 10 years ago
Matthew Lagoe 617b5f84f0 Merged in shubham_meena/ryzomcore (pull request #71)
documentation for doxygen containing plugin management system
10 years ago
botanic f7d338bdf6 Fix syntax error with unassigned ticket 10 years ago
botanic 8e46cd7ab9 fixed language when logged in 10 years ago
botanic f15d151fbd updated bootstrap and charisma 10 years ago
botanic f21fa61d5f updating plugins 10 years ago
botanic e373874bbf Fix path's in plugins 10 years ago
botanic 912a15c1bd fixed change email on shard 10 years ago
botanic e2882d1b9f Changed to use new throw new SystemExit(); 10 years ago
botanic fe8cb3595a Merge 10 years ago
botanic ea9324bd51 Fix add user in settings 10 years ago
kaetemi 54435b9258 Crash workaround 10 years ago
kaetemi 7edf900a2e Remove bad data in sql 10 years ago
kaetemi 9c26f8e345 Don't cache redirects 10 years ago
kaetemi 41e0baca84 Throw exception instead of exit. 10 years ago
kaetemi 7a62843aee Merge 10 years ago
kaetemi 71302bf982 Die, don't exit 10 years ago
botanic 441ede1cad Merge 10 years ago
botanic b081d97b3c Fix #181 10 years ago
kaetemi d9dac55a28 Merge 10 years ago
kaetemi f920da3873 Force all user ids equal 10 years ago
botanic c13264c207 Fix #182 10 years ago
botanic 5c63089b0a Merge 10 years ago
botanic 5d6a38ec16 settings page display bug 10 years ago
kaetemi 2b2ffb8052 Transactions not required here either, actually 10 years ago
kaetemi 5954b96813 Merge 10 years ago
kaetemi 41385c3b8c Reduce unnecessary manual transaction commit 10 years ago
botanic a533354df8 Merge 10 years ago
botanic 110b36dd4a missing ) 10 years ago
botanic dee11a74c9 updated hgignore as well as fixed php errors 10 years ago
kaetemi d4423d956f Disable connection cache workaround 10 years ago
kaetemi a120179e75 Don't create transactions for SELECT queries 10 years ago
kaetemi 3ddf42f0ef Fix #180 10 years ago
kaetemi 04ef076448 Fix #180 10 years ago
kaetemi 978c09b029 Only make a single database connection per host, and keep them persistent 10 years ago
kaetemi 75c5232dcf Remove excessive javascript interactivity in AMS 10 years ago
kaetemi 340fae54ed Some more adjustments for DBLayer... 10 years ago
dfighter1985 6cd4d756db Mark the DFN editor modified after adding / removing an element.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 f587e06d7a Implemented saving.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 173dbba11c Implemented add button.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 a68dd4c33e Implemented definition editing.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 ec8a7522b2 Implemented remove button.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 73a2b9bc90 Load comments, log, and definitions.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 a69e09af6f Delete DFN when destroying a DFN editor...
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 cfaebcc1ff Load .typ file.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 24a7cc4a6d Added GUI for the Type editor.
--HG--
branch : dfighter-tools
10 years ago
kaetemi afe03367d9 Re-use the database connection 10 years ago
kaetemi dfc65485ec Make login and email unique keys 10 years ago
dfighter1985 0b9c281b2f Logging DFN changes.
--HG--
branch : dfighter-tools
10 years ago
kaetemi 2bc60334c1 Remove invalid behaviour with ring databases 10 years ago
dfighter1985 e3d405454e No comment. Literally! :D
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 c51b519845 Implemented add and remove buttons.
--HG--
branch : dfighter-tools
10 years ago
kaetemi b64ab2c828 Move misleading copyright notices to a more appropriate location 10 years ago
kaetemi 75dc4fc779 Web services setup tool, fix #141 10 years ago
dfighter1985 ed1c600c4d Save changes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 afc8aef238 Change the name in the list too.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 e2cb637a13 Enable saving when modified, disable saving after saving.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 f1a6a8d9cd Apply changes.
--HG--
branch : dfighter-tools
10 years ago
kaetemi b500066026 Move SQL files 10 years ago
dfighter1985 25d808f7ea Added first iteration of the file path property manager / editor / factory.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 259dc63ac4 Use enum property manager for the type.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 e768506349 Load DFN.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 230159e2b6 Added common base class for Typ, Dfn, and From dialogs: GeorgesDockWidget.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 0a3d7d6355 Added GUI for DFN dialog.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 d232939294 Merged default
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 cfabc13ffd EOL
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 ad4771e3d1 Show an error message when form loading fails.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 0d530f15f6 Renamed signal.
--HG--
branch : dfighter-tools
10 years ago
kervala 3625818283 Fixed: EOL 10 years ago
kervala 687927ba10 Changed: Preserve attributes when copying files in Application Bundle 10 years ago
dfighter1985 58b50e7d7e Save the log too, when saving..
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 e6aa34584a Mark file modified even when using the context menu.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 0ae8fbde29 Implemented rename context menu.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 77a21cfc99 Now logging changes.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 3c0e76e78b Load log into the log tab.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 f0fdd41675 Don't disable the log tab!
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 5bb3e16ca4 Implement 'delete array entry' context menu command.
--HG--
branch : dfighter-tools
10 years ago
kervala f57380f19b Changed: Including malloc/malloc.h is useless 10 years ago
kervala bb324e80b4 Fixed: Use ...ARBPROC declarations for ARB_occlusion_query (to fix a conflict with official OpenGL headers under Mac OS X) 10 years ago
kervala 8d3ea38ffc Fixed: Compilation under Mac OS X (malloc is already aligned on 16 bytes and memalign doesn't exist) 10 years ago
dfighter1985 6fb9c35d84 Implemented 'append array entry' context menu
--HG--
branch : dfighter-tools
10 years ago
kaetemi 4402e2134c Remove warnings, ref #177 10 years ago
kaetemi 031cd3b68d Adjust casts, ref #177 10 years ago
kaetemi 2a27139594 Inventory bug workaround, ref #177 10 years ago
kaetemi 573fb44088 Link group_wheel.cpp, ref #176 10 years ago
dfighter1985 d593ef5d17 Crash fixes related to Georges array size changing.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 eeac53ebba Added support for creating arrays.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 d046a970d9 Initialize CFormItem fields...
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 655d446151 When reaching 0 array size, delete the array node.
--HG--
branch : dfighter-tools
10 years ago
kaetemi da5558d50a Merge with default
--HG--
branch : multipass-stereo
10 years ago
kaetemi 46aa5cef29 EOL 10 years ago
kaetemi 02e8f6e956 EOL 10 years ago
kaetemi 8fab3ccce1 EOL 10 years ago
dfighter1985 9b6ff808c5 Save from the file menu too.
--HG--
branch : dfighter-tools
10 years ago
dfighter1985 a810b29ec7 Merged default.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 5dd07248a1 Merge 10 years ago
kaetemi 683a0adc60 Crashfix in case pacs_prim are exported into .ig 10 years ago
dfighter1985 0b44c8a7a0 Save changes.
--HG--
branch : gsoc2014-dfighter
10 years ago
shubham_meena d75473f567 documentation for doxygen containing plugin management system 10 years ago
dfighter1985 827faaf3e7 Array resize.
--HG--
branch : gsoc2014-dfighter
10 years ago
Matthew Lagoe 941c2e3220 Merged in shubham_meena/ryzomcore (pull request #70)
Adding comments with more description and removed doxygen errors
10 years ago
shubham_meena c9f54c3806 Improved documentation with doxygen generated doc 10 years ago
dfighter1985 6000fe187f Moved BrowserCtrlPvt to it's own files.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 0e0de8ec52 Fix shape lightmap optimize 10 years ago
kaetemi 9a19f2041b Crashfix in case pacs_prim are exported into .ig 10 years ago
kaetemi d4b7a3cf8a Crashfix in case pacs_prim are exported into .ig 10 years ago
kaetemi 8f7931d6a8 Crashfix in case pacs_prim are exported into .ig 10 years ago
kaetemi e0e1953f41 Crashfix in case pacs_prim are exported into .ig 10 years ago
kervala e811ff77b1 Merge 10 years ago
kervala 31e9934ba7 Changed #172 XML floating point serialization not using neutral culture 10 years ago
kaetemi 104d6d587a Additional fix #172 set _Locale to NULL after release 10 years ago
kaetemi 75e2841519 Fix continent path bug 10 years ago
kervala 41f6e70dc9 Fixed #172 XML floating point serialization not using neutral culture 10 years ago
kaetemi 772245a3e6 Merge with default
--HG--
branch : multipass-stereo
10 years ago
kaetemi 5bc60987be Maxscript selection clear fix 10 years ago
kaetemi f718380f52 Zone light exporter adjust 10 years ago
dfighter1985 fb5ce7baac Use the string 'array size' as the name for the property holding the array size.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 6d074bc618 Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 2a0af6cabf Only add atoms to the property browser..
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 99502a1bfc Handle selected arrays too ( show size, changing it isn't implemented yet ).
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 5812058ea6 Only add atoms to the property browser.
--HG--
branch : gsoc2014-dfighter
10 years ago
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
10 years ago
botanic 64fafda9bc updated hgignore 10 years ago
botanic 4b871c43f5 updated doxygen 10 years ago
shubham_meena 2a2c2b1d67 Merged in Gsoc14-ryzomAppImprovements (pull request #1)
Merging Gsoc 14 branch with default
10 years ago
shubham_meena ee6db8ef7f code modified to accept request through Rest and sending achievments in response
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena a01e331639 bug fix in plugin installation
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena 750ded21bd added option for posting data in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena f8a92326ed BugFixes: achievements and API key management plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena 5fd2615f0e small bug fix: support group missing brackets at end
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena ac980adcc7 Added few more options in REST api
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
kaetemi 993f2ffab7 Snowballs update
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 aa95cc3c4b Apply changes.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 1b7b081c60 Shown properties can now be edited.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 a43c2f0a5e First iteration of the property browser.
--HG--
branch : gsoc2014-dfighter
10 years ago
shubham_meena 0e4b004978 Bug Fix: delete plugin option available for inactive plugins
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena acb4f26f1a API key management plugin for ams
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena 0d8fe2b7aa Achievements plugin integrated with ams
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena 70e8310fff added API key mangement and Achievements plugin during installation of ams
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
shubham_meena 990eae1065 Adding activated plugins to the main options list
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
dfighter1985 9315b7229e Don't enter edit mode in the treeview.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 93376226c4 Use software cursor with attached display
--HG--
branch : multipass-stereo
10 years ago
kaetemi 38abf2193f Project client loading screens into 3D space for HMD
--HG--
branch : multipass-stereo
10 years ago
kaetemi 38a418503d Non-functional direct to rift
--HG--
branch : multipass-stereo
10 years ago
kaetemi aff0cab54e GL: Fix switch from different resolution fullscreen to borderless display
--HG--
branch : multipass-stereo
10 years ago
kaetemi e2bfb5d542 Clean handling of display mode switching in client
--HG--
branch : multipass-stereo
10 years ago
kaetemi 400f479fe1 GL: Handle borderless fullscreen to specified monitor internally
--HG--
branch : multipass-stereo
10 years ago
kaetemi 7c39f7d33b Specify monitor when changing display mode
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 0f7e1c022a Merge default
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 033c86e92c Add the property browser library to the CPack archive when generated.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 7f6608b897 World Editor plugin Linux build fix.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 475c0201ea GUI Editor Linux build fix
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 48bd3cb383 Fixed qrc path.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 50b90f9774 Update the tile list right away if the image is replaced.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 20edb57761 If I add a 256x256 tile, maybe I should remove it as 256x256, not 128x128...
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 4e33e5cf2f Process some scene traversals only once when rendering in stereo
--HG--
branch : multipass-stereo
10 years ago
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
10 years ago
dfighter1985 669c15eda9 Removed yet another unused variable.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 e7ded1f82c Removed unused variable.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi e8a245a133 OVR: Chroma factor
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 613643b033 Repaint immediately when the display channel is changed.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 edf1da1294 Save the last directory where we loaded a tile image from.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 04d17b7a05 Save the last directoy where we loaded a tilebank from.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 f25d152f4f Rotation is now set in the tilebank wrapper and applied when replacing a tile.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 99bcb6cf79 Line endings and copyright headers...
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi e61eb57fd9 OVR: Fix for debug devices
--HG--
branch : multipass-stereo
10 years ago
kaetemi 3fd358d69d OVR: Convert texture coordinates and setup rendering material
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 e2a579c03e Set all images by default.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 84fc5f27b6 Clear before loading the model data.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 2a55904b3e Makes no sense, but doesn't seem to be crashing anymore o.O
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 102d3653d7 3D: Ensure correct fog handling for effects
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 d21aa2b678 Tile loading more or less works. TODO: investigate why displacement map lookup causes crashes.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 6ad1d14617 OVR: Test distortion mesh
--HG--
branch : multipass-stereo
10 years ago
kaetemi 65578ce498 OVR: Test large render target
--HG--
branch : multipass-stereo
10 years ago
kaetemi 2fbf1cb06d 3D: Set matrix modes after changing render target in effect
--HG--
branch : multipass-stereo
10 years ago
kaetemi 339c8b8dfa 3D: Render target matrix context fix
--HG--
branch : multipass-stereo
10 years ago
kaetemi 33235bdf6c OVR: Testing
--HG--
branch : multipass-stereo
10 years ago
kaetemi 2e6893fd48 OVR: Translate camera
--HG--
branch : multipass-stereo
10 years ago
kaetemi 9b79a44f8a OVR: Get orientation
--HG--
branch : multipass-stereo
10 years ago
kaetemi 262c1f84a9 OVR: Generate distortion mesh
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 8bead3f3fd Saving tilebank
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 92e850d296 Texture path.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 bdedd145e4 Surface data.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 55c046252f Oriented stuff.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 688f6de090 Vegetation set stuff.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 caf76f09c8 Most of the functionality works with the new code.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 99ea2c685c OVR: Read device descriptions
--HG--
branch : multipass-stereo
10 years ago
kaetemi f2274d2378 OVR: Iterate devices
--HG--
branch : multipass-stereo
10 years ago
kaetemi b9e10fca72 Cleanup
--HG--
branch : multipass-stereo
10 years ago
kaetemi 0488b706b2 Add placeholders for LibOVR 0.4.0 support
--HG--
branch : multipass-stereo
10 years ago
shubham_meena 204a5b8a18 rest api using curl
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
kaetemi 96bd17ae63 3D: Fix texture coords for FXAA on D3D
--HG--
branch : multipass-stereo
10 years ago
kaetemi 1a413b0fe3 Add FXAA to Ryzom Client
--HG--
branch : multipass-stereo
10 years ago
kaetemi d56047bde6 Remove debug
--HG--
branch : multipass-stereo
10 years ago
kaetemi 8a283ea518 3D: User higher quality FXAA version
--HG--
branch : multipass-stereo
10 years ago
kaetemi fb525e3911 Cleanup snowballs2
--HG--
branch : multipass-stereo
10 years ago
kaetemi ec4762f669 3D: Add FXAA
--HG--
branch : multipass-stereo
10 years ago
kaetemi f59de199cf Fix crash on AMD with legacy clouds
--HG--
branch : multipass-stereo
10 years ago
kaetemi d98f1ede47 Move default render target handling to CDriverUser
--HG--
branch : multipass-stereo
10 years ago
kaetemi e88dedf00c Adjust render target handling for effects
--HG--
branch : multipass-stereo
10 years ago
kaetemi 6c3bcc2439 Merge with default
--HG--
branch : multipass-stereo
10 years ago
kaetemi 1c67d6ec0f GL: Occlusion query bugfix 10 years ago
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
10 years ago
kaetemi 6a21d0503c 3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
10 years ago
kaetemi 8af686f7ef 3D: Cleanup bloom effect
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 299629860b Rotation can now be set.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 78ce8f4f25 GL: Share depth and stencil to get similar behaviour to D3D driver
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 49deedad7d Save the tile border, etc data when saving.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 175af2fa74 Added checks. Yes it's horrible and needs to be refactored.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 503292065c Simplify GUI projection settings
--HG--
branch : multipass-stereo
10 years ago
kaetemi 1965d46dce Off-center GUI cylinder
--HG--
branch : multipass-stereo
10 years ago
kaetemi f2dd6083fa Cylindrical GUI
--HG--
branch : multipass-stereo
10 years ago
kervala 7aedffce9a Changed: #172 XML floating point serialization not using neutral culture (for VC++ 2005 and up) 10 years ago
kervala b71ec9e7d4 Fixed: build_interface currently only works with 32 bits bitmaps 10 years ago
kervala ffb7df28ff Fixed: VC++ 2010 compiler bug in for loop variables reuse 10 years ago
kaetemi e4e1e3e5a1 Sound orientation with HMD and Headphones
--HG--
branch : multipass-stereo
10 years ago
kervala a29f525c99 Fixed: Some NeL tools in 3d directory don't need NeL 3D 10 years ago
kervala 9aabaebc38 Fixed: Compilation of PACS tools without NeL 3D 10 years ago
kaetemi c11706feb8 Project GUI into space
--HG--
branch : multipass-stereo
10 years ago
kaetemi f32c3bf6b0 Temporary crashfix, ref #68
--HG--
branch : multipass-stereo
10 years ago
kaetemi caefb04928 Restore camera and scene viewport after disabling VR
--HG--
branch : multipass-stereo
10 years ago
shubham_meena ce53f5f26c API key management calender
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
kaetemi c70d8597b2 Merge with default
--HG--
branch : multipass-stereo
10 years ago
dfighter1985 1a49f9fedb Apply the current zoom factor!
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 851afcf955 Don't reload the pixmaps every time they are displayed... -.-
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 1265d6b064 Line endings...
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 79c6f50054 Render target format (for alpha)
--HG--
branch : multipass-stereo
10 years ago
kaetemi 61f97fae40 Fix issue with render target in OpenGL when size not specified
--HG--
branch : multipass-stereo
10 years ago
kaetemi 22d03c5f79 Mode2D selection
--HG--
branch : multipass-stereo
10 years ago
kaetemi dac5b2d274 Merge with game-device
--HG--
branch : multipass-stereo
10 years ago
kaetemi b1e2b60381 Add render target manager, issue #47
--HG--
branch : multipass-stereo
10 years ago
kaetemi 8d8d340968 Bugfix 10 years ago
kaetemi 1cf184c09d Fix XRef ligo export 10 years ago
kaetemi e58df5f7e9 Faster ligo export step 10 years ago
kaetemi c8dcfe8d05 Crashfix for 3ds Max export 10 years ago
dfighter1985 a994f23948 When hitting 'save as' ask for a filename even if one is set.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 0cef115a74 Should store the filename after opening..
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 ac643d2bb9 Should only add 1 tile here...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 eee43ad1ea 128 and 256 tiles don't have alpha, so no need to load/save them.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 4bff87ca36 Replace and delete image should be applied to the correct channel now.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 7b1ee54427 Show the image that belongs to the channel that is selected.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 4d54cca6a0 Copyright headers...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 ddd687325f Close the loaded file and return true...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 ac73999f07 Set teh current selection to row 0
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 3e2addc057 Save and load the tilebank texture path.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 0f5e475d1c Save and load the veget set filename.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 431178321f TileBank loading.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 c8914248db Add the already selected tilesets to the land when editing.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 ddc7961e9b Connected the oriented combobox and now saving it's value to the tilebank.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 95b67026bf Implemented saving of the currently stored tilebank data.
--HG--
branch : gsoc2014-dfighter
10 years ago
kaetemi 8e7a3b27d7 ryzomcore/v0.9.1 10 years ago
kaetemi c461502dc7 Crash workaround in IG loading, ref #171 10 years ago
kaetemi 9061eb8389 Cleanup 10 years ago
kaetemi f49e9c5df1 Fix Skin export interface issue, #169 10 years ago
kaetemi a9e3804011 Add warning 10 years ago
kaetemi 7d8e803f7a Crashfix Physique export 10 years ago
kaetemi 6b0d468240 Remove a debug assert 10 years ago
kaetemi 9f19ade30c Bugfix 10 years ago
kaetemi 2b8e006981 Initialize object viewer viewport at correct size 10 years ago
kaetemi 617d1235d1 Compile fix 10 years ago
nimetu 0d2fc4696f Crafted tool durability, fix #156 10 years ago
dfighter1985 89c6180144 As it turns out, tilesets can be assigned to multiple lands...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 8a704b7f5f Implemented the GUI part of saving...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 b004bb9d01 128x128 tab should be shown by default.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 4326ca1df8 Implemented tile image replace.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 5866a61cff Implemented tile image deletion.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 599ba19de2 A little refactoring.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 e06858f2df Reindex tile item nodes after deleting a node.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 f0a67d0c2e Implemented tile deletion.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 d31dfdb6e4 I must be blind...
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 d2a414edb4 Implemented Tile addition.
--HG--
branch : gsoc2014-dfighter
10 years ago
shubham_meena 3b3a595903 bug fix: added template path option in .info file
--HG--
branch : Gsoc14-ryzomAppImprovements
10 years ago
dfighter1985 78f4654063 Implemented tilebank texture path setting.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 df7307583b Implemented choosing / resetting vegetset for tile sets.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 2993c88a5d When selecting another land, select the first tile set, if it exists.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 f66c1e837e Connect the selection model so the widgets are updated.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 9b403212c0 Each land has it's own TilesetModel now. When changing the land the model also changes.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 947782a2c5 Implemented land name changing.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 9519c4f0f5 Implemented land removal.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 02ccd3b1c1 Implemented land adding.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 e9e42701b9 Renamed land related widgets.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 c7ca20c748 Implemented tileset move up and move down.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 9d1fec6ce1 Implemented tileset rename.
--HG--
branch : gsoc2014-dfighter
10 years ago
dfighter1985 71fc4a098b Implemented tileset removal.
--HG--
branch : gsoc2014-dfighter
10 years ago