Commit Graph

4109 Commits (e4883accebc208e7bcad53b4efcf57a91b1f6a59)

Author SHA1 Message Date
Inky 0ee458b231 Added: display local chat message
--HG--
branch : lua
6 years ago
Inky 63172a634b Added: get and set rgba database entry
--HG--
branch : lua
6 years ago
ulukyn 8df7fd34e1 Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn 2d0d50cb70 Added: Player can now ask a pet (zig) to enter/leave from his bag (an icon is displayed when pet is on the bag)
--HG--
branch : compatibility-develop
6 years ago
kervala ab00d8a2f1 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala 6f545aedd5 Changed: Use PCH in World Editor Primitive Plugin
--HG--
branch : develop
6 years ago
kervala 0ef3f3f5a7 Changed: Creation time
--HG--
branch : develop
6 years ago
kervala 4a87a3f30b Fixed: Wrong operator (should be = instead of ==)
--HG--
branch : develop
6 years ago
kervala 0d0a3ca97f Changed: Updated LZMA SDK to version 19.00
--HG--
branch : develop
6 years ago
kervala 869a5f2b53 Changed: Use new LZMA SDK
--HG--
branch : develop
6 years ago
kervala 931b62d2e4 Changed: Updated LZMA SDK to version 18.05
--HG--
branch : develop
6 years ago
kervala d769a22686 Fixed: Don't use current servers count if default one is hihger
--HG--
branch : develop
6 years ago
Nimetu bbd0e5c878 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 9254e794e1 Fixed: use-after-free on deleted mouse pointer
--HG--
branch : develop
6 years ago
Nimetu 86db1f29ac Changed: add text/lua content type for CGroupHTML and Webig notif thread
--HG--
branch : develop
6 years ago
Inky ade58bd747 Added: set auto-pacts lua bind
--HG--
branch : compatibility-develop
6 years ago
Inky 485295d27d Changed: updated client_default.cfg to match new cvar
--HG--
branch : compatibility-develop
6 years ago
Nimetu f979597830 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 35f5c1b77f Fixed: Mount stays invisible when unmounting while in first person view.
--HG--
branch : develop
6 years ago
Inky f27a7ec795 Added: Store user created channels in xml file
--HG--
branch : compatibility-develop
6 years ago
Nimetu fb54672815 Changed: Implement HTML renderer with CSS styling
--HG--
branch : develop
6 years ago
Ulukyn c582964448 Added: home propertie of html group (so lua scripts can setup the home)
Fixed: adding new landmarks with lua don't remove respawn points if player is not in an island

--HG--
branch : compatibility-develop
6 years ago
Nimetu 4e7d337297 Changed: Only capture mouse for freeview or when button is held and mouse is moving
--HG--
branch : develop
6 years ago
Nimetu abf44b1cbe Changed: update ryzom.com urls
--HG--
branch : compatibility-develop
6 years ago
Nimetu 6948adc0f7 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu eee4684b0c Fixed: Invalid window mode switch in some cases.
--HG--
branch : develop
6 years ago
kervala 265c42cc50 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala 78c39850ae Fixed: Check profile details in backup profiles if deleted
--HG--
branch : develop
6 years ago
kervala 21f15a47bc Fixed: If no profile found, don't process the default one
--HG--
branch : develop
6 years ago
Nimetu d483d64dfc Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu ab7ad10796 Fixed: Save landmarks immediately on change
--HG--
branch : develop
6 years ago
Nimetu 3ccb4e0ae3 Fixed: Invalid comparison of signed value
--HG--
branch : compatibility-develop
6 years ago
Nimetu 2f0a831d52 Fixed: Invalid comparison of signed value
--HG--
branch : develop
6 years ago
Nimetu 2b927a7a47 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu ac68a37f1b Changed: Move user landmarks from icfg to own xml file
--HG--
branch : develop
6 years ago
Nimetu 117dc37a33 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 4a31913c60 Changed: Target command to support keyword search.
--HG--
branch : develop
6 years ago
Inky da8702479f Fixed: LevelDesign AI script documentation and few incode typos
--HG--
branch : compatibility-develop
6 years ago
Riasan 21f2c0ea59 Added: Team Invite button by Guild Member List and Friend List
--HG--
branch : compatibility-develop
6 years ago
Nimetu 85c52973e7 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 838dd14d15 Changed: Use popup menu for chat-copy function
--HG--
branch : develop
6 years ago
ulukyn 425268e956 Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn ce83c0ae51 Changed: Players when Outpost is in active war (OutpostInFire) can't be Neutrals
--HG--
branch : compatibility-develop
6 years ago
Nimetu 48247f10e5 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 5a1a167de9 Added: Scroll bar for main chat tabs
--HG--
branch : develop
6 years ago
Nimetu cbb092c3d5 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu d97f5b1a8b Changed: Enable UI bilinear filtering by default. Requires new atlases to be generated
--HG--
branch : develop
6 years ago
Nimetu 42f45aff1e Removed: Client interface xml from compatibility-develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu e4b83a4724 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 4e515eedf0 Added: game:onLoadMap lua event to allow override map texture as needed
--HG--
branch : develop
6 years ago
Nimetu 5ed62187dc Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu ec9a0e6d38 Fixed: Crash in lua getWeatherValue() when continent was not loaded
--HG--
branch : develop
6 years ago
Nimetu 5cc2a0c280 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 5e42d09482 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu a7b931353c Changed: Fixes for client local/debug mode
--HG--
branch : develop
6 years ago
Inky 6c1d44bc51 Added: sendMsgToServerUseItem lua bind
--HG--
branch : develop
6 years ago
Inky bc35724622 Added: Inventory filter for animals
--HG--
branch : develop
6 years ago
Nimetu fb56cd960e Merge with develop
--HG--
branch : compatibility-develop
6 years ago
inky ed31302163 Changed: Random command has now private roll.
--HG--
branch : develop
6 years ago
Nimetu b7851fc282 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
inky ef1a51d0e4 Fixed: Free animal in player trade.
Player could free an animal already selected in trade.
When abort, client was given a copy of the (ghost)item in bag.

--HG--
branch : develop
6 years ago
Nimetu 002005f294 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 09cb6f56dd Changed: Move ui scale limits to client cfg
--HG--
branch : develop
6 years ago
Nimetu fc03cea84a Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu c7d65c7063 Changed: Improve inventory search UI
--HG--
branch : develop
6 years ago
Nimetu d8638fa42b Changed: For ingame help html files, use english files as fallback.
--HG--
branch : develop
6 years ago
Nimetu fa16ca8dd9 Changed: Merge music player play/pause button into one, add stop button
--HG--
branch : develop
6 years ago
Nimetu 798494ffbf Changed: Repeat/shuffle buttons to music player
--HG--
branch : develop
6 years ago
Nimetu 8a18a5dade Merge with experimental-ui-scaling
--HG--
branch : develop
6 years ago
Nimetu 6c029e7af7 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 2877ece3c6 Changed: Add right click copy-to-clipboard action to chat
--HG--
branch : develop
6 years ago
Nimetu 9503e2f28f Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 7ccd9da497 Merge with develop
--HG--
branch : experimental-ui-scaling
6 years ago
Nimetu 4c516f90f5 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu 6a6ce67a58 Fixed: Displaying song playtime
--HG--
branch : develop
6 years ago
Nimetu 6c8e42361a Fixed: Playing music files with @ in the filename.
--HG--
branch : develop
6 years ago
Nimetu e5b7064a4d Changed: New font texture implementation
--HG--
branch : develop
6 years ago
Nimetu e994c12983 Added: FFmpeg based audio decoder
--HG--
branch : develop
6 years ago
Nimetu e4ac3748e9 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu c93d8ffd50 Changed: Improve music player UI, add repeat, shuffle options
--HG--
branch : develop
6 years ago
Nimetu c43ffc5a85 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Nimetu f4ef386ec9 Changed: Limit fullscreen resolutions to 1024x768 or higher
--HG--
branch : develop
6 years ago
Nimetu 94861ac709 Changed: Make sure char select window resolution is at least 1024x768
--HG--
branch : develop
6 years ago
Nimetu ace1684f5c Fixed: Ingame UI restored wrongly if window resized in char select mode
--HG--
branch : develop
6 years ago
Riasan 92388de52d Changed: active teleport option via map on r2 for privs
--HG--
branch : compatibility-develop
6 years ago
kervala 37f5f6ef5b Added: Required files for client
--HG--
branch : compatibility-develop
6 years ago
Nimetu 3157984c21 Merge with develop
--HG--
branch : experimental-ui-scaling
6 years ago
ulukyn 3b9550ca2a Removed: client datas moved to RyzomDatas repository
--HG--
branch : compatibility-develop
6 years ago
ulukyn 033bd1f373 Removed: client datas moved to RyzomDatas repository
--HG--
branch : compatibility-develop
6 years ago
ulukyn e4ad9e425b Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn 056c6b86e6 Fixed: Added a check for https:// npc web pages
--HG--
branch : compatibility-develop
6 years ago
Nimetu 56727e7818 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
Jan Boon 37c567c88c
File ai_instance.cpp uses inline processStateEvent from state_instance.h which uses inline testCompatibility from event_reaction_include.h
https://gist.github.com/sjvs/8795aae6671734ff991033b510e62de5
6 years ago
Jan Boon 0f44a7da27
Fix pointer accessed after delete 6 years ago
ulukyn 203187542c Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn 57440753a9 Added: luaGetElement for CInterface3DScene and getBBoxSize* for CInterface3DShape
--HG--
branch : compatibility-develop
6 years ago
kervala 2f3a5f2606 Changed: Minor changes
--HG--
branch : compatibility-develop
6 years ago
kervala 1380a94f5d Changed: Use LIST(APPEND instead of SET
--HG--
branch : develop
6 years ago
kervala 689cc3e40a Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala 58efd082c1 Changed: Don't include curl.h in headers to avoid dependencies on CURL for more files that required
--HG--
branch : develop
6 years ago
ulukyn 9237868f44 Fixed: Revert remove of throw in EPatchDownloadException
--HG--
branch : compatibility-develop
6 years ago
ulukyn d6cbf71729 Added: Usefull function to get ucstring from utf8 in one step
--HG--
branch : compatibility-develop
6 years ago
ulukyn 397fc6a589 Added: Ctrl DB Sheet tooltip can be overwrited
--HG--
branch : compatibility-develop
6 years ago
ulukyn 29d931ed3c Fixed: Items can be moved to Zigs Inventoris using context menu
--HG--
branch : compatibility-develop
6 years ago
kervala e300f6219e Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala b86bf43090 Fixed: Simplify certificates management
--HG--
branch : develop
6 years ago
kervala ad98b1414a Changed: Minor changes
--HG--
branch : develop
6 years ago
kervala ad99c2afb7 Fixed: Warning (missing return)
--HG--
branch : develop
6 years ago
kervala c7ded068d9 Fixed: Compilation (reverted back some changes)
--HG--
branch : develop
6 years ago
Nimetu 2e479e6165 Changed: shadow attributes to editbox templates
--HG--
branch : compatibility-develop
6 years ago
Nimetu 9d0576fbcf Merge with develop
--HG--
branch : compatibility-develop
6 years ago
ulukyn 115f47bada Added: RRP points (win on events) display and icons for all others points
note: urls are hardcoded, not the best way...

--HG--
branch : compatibility-develop
6 years ago
Nimetu 15355e3815 Changed: shadow attributes for CViewText and editbox templates
--HG--
branch : develop
6 years ago
ulukyn df4f3b7f8c Fusion
--HG--
branch : compatibility-develop
6 years ago
kervala 81929a6a75 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala dcaf417aee Changed: Minor changes
--HG--
branch : develop
6 years ago
kervala 78670dfdda Fixed: Compilation with VC++ 2010
--HG--
branch : develop
6 years ago
kervala f39c6ed3c6 Fixed: Warnings
--HG--
branch : develop
6 years ago
kervala facc5f6d28 Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
6 years ago
kervala 53166342d8 Fixed: Warning
--HG--
branch : compatibility-develop
6 years ago
ulukyn 239f823305 Fixed: No changes, just beautifyed xml code (really a pain to change this baddly formated xml..)
--HG--
branch : compatibility-develop
6 years ago
ulukyn dbce461590 Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn b1ce25a9b8 Fixed: No changes, just beautifyed xml code (really a pain to change this baddly formated xml..)
--HG--
branch : compatibility-develop
6 years ago
kervala ab234a43b0 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala c4888b2d5b Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
6 years ago
kervala 675f85c288 Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
6 years ago
ulukyn a2fb4158c1 Eapply: CTypeVersion incremented for sitem and item (because the client don't crash again and i found why )
--HG--
branch : compatibility-develop
6 years ago
ulukyn f8924c44ad Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn cab6b7faed Reverted: CTypeVersion incremented for sitem and item (because the client crash and i don't have found why...)
--HG--
branch : compatibility-develop
6 years ago
kervala 4545b43160 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala d9e6d34fcc Changed: Make sslCtxFunction private and don't include curl.h in header
--HG--
branch : develop
6 years ago
ulukyn 79a62ed048 Changed: CTypeVersion incremented for sitem and item
--HG--
branch : compatibility-develop
6 years ago
kervala e14d43f262 Merge with develop
--HG--
branch : compatibility-develop
6 years ago
kervala f04fd9809c Fixed: Allow to use custom CA Certificates under all platforms if libcurl compiled with OpenSSL for WebIG and login
--HG--
branch : develop
6 years ago
Riasan eb4f1aac92 Added: display marauder (black_kami) fame into the Fame window
--HG--
branch : compatibility-develop
6 years ago
ulukyn 217533f0f7 Fixed: check ClientCfg.CurlCABundle is not empty before check the first char (thx nimetu)
--HG--
branch : compatibility-develop
6 years ago
ulukyn 0fe98e8150 Fusion
--HG--
branch : compatibility-develop
6 years ago
ulukyn 5d5a818fd6 Added: add a way to prefix CurlCABundle file with defaultConfigFileName using "%"
Use added cacert.pem from mozilla like default CA file

--HG--
branch : compatibility-develop
6 years ago
Riasan 1bfc9824ba Fixed: overlapping fame tribe List
--HG--
branch : compatibility-develop
7 years ago
kervala 1000e29a96 Fixed: Compilation with VC++ 2013
--HG--
branch : develop
7 years ago
kervala 29afcd7f9c Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Riasan ca3e8f284c Fixed: dapper display and search input dont overlap eachother if inventory window it on min w
--HG--
branch : compatibility-develop
7 years ago
kervala 5cb3f8426d Changed: Install Ryzom GameShare headers and libraries
--HG--
branch : develop
7 years ago
ulukyn 15cbe4d1c1 Fusion
--HG--
branch : compatibility-develop
7 years ago
ulukyn 9192b129d9 Added: getSheetFamily lua bind
--HG--
branch : compatibility-develop
7 years ago
Nimetu c84ef71e21 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu a2707f93f1 Fixed: Wrong resolution saved to config when window receives wm_destroy signal
--HG--
branch : develop
7 years ago
ulukyn 455ee32bd5 Added: getSheetLocalizedName and getSheetLocalizedDesc lua bind
Changed: DIV get now id with base the id of the html group

--HG--
branch : compatibility-develop
7 years ago
ulukyn 7dd56d06d0 Fusion
--HG--
branch : compatibility-develop
7 years ago
ulukyn 9eca2f69cd Added: Add "@LUA " prefix to url set on shapes with text. When player click on shape, run the lua code
getDbProp64 return a variable instead of node->getValue64() return value.

--HG--
branch : compatibility-develop
7 years ago
Riasan 30bbcb2345 Fixed: overflow header text, quantity input size
--HG--
branch : compatibility-develop
7 years ago
kervala 6311240b6c Merge with develop
--HG--
branch : compatibility-develop
7 years ago
kervala adb3362b44 Changed: Always compile ryzom_gameshare if WITH_RYZOM is defined
--HG--
branch : develop
7 years ago
Riasan 5e7799f089 Fixed: text height, window size , Vendor markup exploit for resale
--HG--
branch : compatibility-develop
7 years ago
ulukyn fbcaf29a3d Added: webig_bot_chat_buy and webig_bot_chat_buy_item templates
--HG--
branch : compatibility-develop
7 years ago
ulukyn 100161466d Added: webig_bot_chat_buy and webig_bot_chat_buy_item templates
--HG--
branch : compatibility-develop
7 years ago
ulukyn dca2173d63 Added: setDbProp64 lua function
--HG--
branch : compatibility-develop
7 years ago
Nuno Gonçalves 6f22bc0478 Add new Mektoub type used for new pets companions
--HG--
branch : compatibility-develop
7 years ago
ulukyn 668d7a556f Changed: Increase MAX_INVENTORY_ANIMAL to 7. Updates of ui files
--HG--
branch : compatibility-develop
7 years ago
ulukyn e17b290367 Changed: Increse MAX_INVENTORY_ANIMAL to 7 to add 3 pets companions (ingame named ZIGs)
--HG--
branch : compatibility-develop
7 years ago
ulukyn 93364d86b4 Added: Race shape properties of sitems (!!! sitems.packed_sheets must be regenerated with freshly complilated sheets_packer tool !!!)
--HG--
branch : compatibility-develop
7 years ago
Nimetu 1c142ef968 Fixed: Font size calculations for scaled text.
--HG--
branch : experimental-ui-scaling
7 years ago
Nimetu 375cedb09e Merge with develop
--HG--
branch : experimental-ui-scaling
7 years ago
ulukyn 7c12f1027f Backout: brainless commit, we find a better way (thanks nimetu)
--HG--
branch : compatibility-develop
7 years ago
ulukyn b377eefdf3 Added: Trigger to know when an image is downloaded (using lua callback)
md5() lua function

--HG--
branch : compatibility-develop
7 years ago
ulukyn 24b99e677c Changed: Added WinchGate headers to generate_client_db
--HG--
branch : develop
7 years ago
ulukyn 5c9418cff7 Changed: Added WinchGate headers to generate_client_db
--HG--
branch : compatibility-develop
7 years ago
ulukyn f0757edb36 Added: New PvpClan "Marauder" based on fame "black_kami"
--HG--
branch : develop
7 years ago
ulukyn 2625d08c09 Added: New PvpClan "Marauder" based on fame "black_kami"
--HG--
branch : compatibility-develop
7 years ago
Nimetu 531b07db69 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu f80e36ebd6 Changed: Workaround for huge target reticle when max polygon is set to low
--HG--
branch : develop
7 years ago
ulukyn 9cc97b8eba Added: getDbProp64 to get 64b values from db with lua
--HG--
branch : compatibility-develop
7 years ago
ulukyn 6499b1b053 Added: getDbProp64 to get 64b values from db with lua
--HG--
branch : develop
7 years ago
Riasan 475f456926 Changed: Update translation
--HG--
branch : compatibility-develop
7 years ago
Nimetu 0a3f2744b8 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu a62c8eefd4 Fixed: Filtered user landmarks became visible when landmark was edited/removed.
--HG--
branch : develop
7 years ago
Nimetu 4b588caaf6 Added: Copy macro translation
--HG--
branch : compatibility-develop
7 years ago
Nimetu 6bb44135c0 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu 4cca062177 Changed: Move leave team menu option
--HG--
branch : develop
7 years ago
Nimetu 5823e98356 Added: Duplicating macro or macro commands
--HG--
branch : develop
7 years ago
Nimetu 675cd54232 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Riasan b5a0fbe266 Changed: rework "creat guild" UI Window
--HG--
branch : develop
7 years ago
Nimetu 5b4759df72 Changed: Show map search results in a list
--HG--
branch : develop
7 years ago
Riasan 0159dfdd70 Changed: rework "creat guild" UI Window
--HG--
branch : compatibility-develop
7 years ago
Nimetu e7a8f104bf Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu 98ae75fe57 Added: curl ca bundle option to client cfg
--HG--
branch : develop
7 years ago
Nimetu fd2e269e3c Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu 6389fe3048 Fixed: Bad value in client_default.cfg
--HG--
branch : develop
7 years ago
Nimetu 066057d04c Added: Map search translation
--HG--
branch : compatibility-develop
7 years ago
Nimetu 5ee74c1c05 Merge with develop
--HG--
branch : compatibility-develop
7 years ago
Nimetu 923084a818 Added: Command to search and target closest user landmark.
--HG--
branch : develop
7 years ago
Nimetu 11150e6b79 Changed: Switch compass to target mode after successful /tar command.
--HG--
branch : develop
5 years ago
Riasan 92683b7ac0 Fixed: expand login max input
--HG--
branch : compatibility-develop
7 years ago
Riasan a7b0079909 Fixed: ui window size for universe_chanel_warning
--HG--
branch : compatibility-develop
7 years ago
Nimetu 2e7d025109 Changed: Use user requested resolution for both char select and ingame
--HG--
branch : develop
7 years ago
Nimetu 1dc3d51ce2 Added: save_ui action handler to save keys and icfg files
--HG--
branch : develop
6 years ago
Nimetu d7ee450215 Changed: Use user requested resolution for both char select and ingame
--HG--
branch : experimental-ui-scaling
7 years ago
nimetu@gmail.com 0af4ea6687 Added: Allow to set UI scale with /setuiscale command
--HG--
branch : experimental-ui-scaling
7 years ago
nimetu@gmail.com 4ba3973295 Changed: Remove ui scale option from ingame config
--HG--
branch : experimental-ui-scaling
7 years ago
Nimetu 26d8b86949 Merge with develop
--HG--
branch : compatibility-develop
7 years ago