Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity
5,937 Commits
110 Branches
68 Tags
272 MiB
fix-linux-multi-monitor
core4
add-toggle-free-look-ah
main/yubo-dev
fix-media-player-playlist-limit
feature/change-sound-driver-ingame
10-use-item-shortcut-client
53-setting-to-change-tooltip-opacity
47-hide-quality-indicator-on-item-if-equal-to-1
18-enchant-icon-does-not-properly-update-on-weapon
feature/quick-start-py
23-sort-inventory-by-type-weight-bulk-quantity-quality-2
51-shift-enter-at-merchant-no-longer-sells-to-merchant
52-add-escape-shortcut-to-open-quit-menu
60-weapon-does-not-show-in-both-hands-on-load-in
main/atys-live
main/gingo-test
feature/split-action-bar-1-and-2
55-remove-chat-replies-shortcuts
46-rework-item-buff-icon-placement
43-crafting-items-are-not-sorted
40-dragging-from-player-trade-to-inventory-takes-two-tries
38-add-smooth-resizing-of-entitie-when-vpb-are-changed
36-add-ability-to-have-translated-titles-with-untraslated-fields
35-allow-drag-and-drop-between-zig-and-guild
feature/compatibility-old-gcc
26-encoding-issues-in-client-beta-after-core4-merge
fix-viewtext-localized-text
main/atys-pre-live
21-fix-nopatch-without-argument-crash
30-changes-for-silan-refactoring
fixes
27-fixed-crash-with-html-image-downloads
feature/hunter
16-drag-drop-to-player-trade-window-from-all-inventories
23-sort-inventory-by-type-weight-bulk-quantity-quality
25-remove-lock-option-from-item-menu-in-guild-inventory
feature/colissions-stairs
feature/core4-atys
feature/hunter-dxsdk-download
merge/2021-11-19
fix-area-effect-flying-text
add-screenshot-dir-to-config
feature/develop-atys
self-kill
inventory-fixes
develop
13-inventory-fixes
20-add-equip-option-to-right-click-dialog-in-all-inventories
6-animal-status-innacurate-when-zig-is-in-bag
atys
use-item-macro
ryzomclassic-develop
ryzom/silan_refactoring
feature/prepare-cross-merge
storyline/s2e0
feature/bonusmalus-timers
ryzom/ark/features
ryzom/op_refactoring
feature/css-lang-var
ryzom/ui/improvements
fx
feature/hires-textures
feature/cdb-packed-ryzomclassic
feature/cdb-packed
feature/opengl3
ryzom/patch-changes
fix_opengl_on_mac
ryzom/deepl
ryzom/lua-features
fix-media-player
feature/code-to-root
feature/post-code-move
feature/pre-code-move
fix-menu-scroll
storyline/s2e1
webig-fixes
ryzom/sheets
feature/streamed-package
hg/develop
hg/hotfix/patches-from-atys
hg/yubo
hg/atys
hg/ark
hg/feature/html-improvements
undelete-develop
hg/feature/menu-navi
hg/compatibility-develop
kaetemi-develop
feature/nel-dll
feature/version-resources
feature/clean-deprecated
feature/3ds-max-2020
feature/pipeline-tools
feature/build-pipeline-v3
hg/feature/material-editor
hg/feature/opengl3
hg/feature/qt5
hg/feature/cef3
hg/feature/streamed-package
hg/feature/light_cycle
hg/compatibility
hg/feature/gsoc2012-fabien
hg/feature/build_pipeline_v3
hg/feature/cdb-packed
hg/feature/game-device
hg/feature/sdl2
hg/feature/sse2
hg/feature/gsoc2013-dfighter
hg/feature/sound
3.3.0
Live-746
Live-791
Live-803
Live-813
Live-831
Live-832
Live-834
compatibility-merge
latest-default-graft
latest-graft-to-default
latest-merge-from-default
live/837
live/893
live/895
ryzom-patch-3.0.0
ryzom-patch-3.0.1
ryzom-patch-3.0.2
ryzom-patch-3.1.0
ryzom-patch-3.1.0-april_patch
ryzom-patch-3.1.0-hotfix
ryzom-patch-3.2.0
ryzom-patch-3.2.1
ryzom-patch-3.3.0
ryzom-patch-3.3.1
ryzom-patch-3.4.0
ryzom-patch-3.4.0_Atysmas
ryzom-patch-3.4.0_Steam_Fix
ryzom-patch-3.5.0
ryzom-patch-3.5.0.9637
ryzom/3.0.0
ryzom/3.0.1
ryzom/3.0.2
ryzom/3.1.0
ryzom/3.1.0-april_patch
ryzom/3.1.0-hotfix
ryzom/3.2.0
ryzom/3.2.1
ryzom/3.3.0
ryzom/3.3.1
ryzom/3.4.0
ryzom/3.4.0-atysmas
ryzom/3.4.0-steam_fix
ryzom/3.5.0
ryzom/3.5.0.9637
ryzomcore/v0.10.0
ryzomcore/v0.11.0
ryzomcore/v0.11.1
ryzomcore/v0.11.2
ryzomcore/v0.11.3
ryzomcore/v0.12.0
ryzomcore/v0.8.0
ryzomcore/v0.9.0
ryzomcore/v0.9.1
ryzomcore/v1.0.0
ryzomcore/v1.0.1
ryzomcore_0_8_0
v0.10.0
v0.11.0
v0.11.1
v0.11.2
v0.11.3
v0.12.0
v0.8.0
v0.9.0
v0.9.1
v1.0.0
v1.0.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd03e896702'
${ noResults }
Commit Graph

1581 Commits (d03e89670208e3fa2153afd62e439b2300806a94)

Author SHA1 Message Date
Nimetu d4ed66d99b Added: URL #fragment navigation. 
--HG--
branch : develop
 9 years ago
Nimetu f4599e183b Added: Common attributes to h1..h6 elements 
--HG--
branch : develop
 9 years ago
kervala 34b3334182 Fixed: Bug when CURLMOPT_MAX_HOST_CONNECTIONS is not supported 
--HG--
branch : develop
 9 years ago
kervala d4dd2b7264 Fixed: Getters for Anisotropic Filtering 
--HG--
branch : develop
 9 years ago
kervala b4e1dcbc10 Fixed: Link error under Debian Squeeze 
--HG--
branch : develop
 9 years ago
kervala 7a2dd18095 Changed: Add and use more constants in config.h 
--HG--
branch : develop
 9 years ago
kervala 520eb941b1 Changed: Simplified CMake ELSE and ENDIF 
--HG--
branch : develop
 9 years ago
kervala 06994f4c58 Added: RC files for NeL drivers 
--HG--
branch : develop
 9 years ago
kishan_grimout 83a81801ea fix crash when a shader fails to build 
--HG--
branch : develop
 10 years ago
kervala 244c2eb211 Fixed: Open web pages in background under OS X and don't close client 
--HG--
branch : develop
 9 years ago
kervala 4a02370266 Fixed: Crash under Linux saying you can't use X in multi-threaded environment 
--HG--
branch : develop
 9 years ago
kervala d50c40c473 Fixed: Unable to open URLs under Linux while using Steam Runtime 
--HG--
branch : develop
 9 years ago
kervala 35471ace88 Fixed: Typo 
--HG--
branch : develop
 9 years ago
kervala d1f925d319 Changed: Give priority to xdg-open (if present) to open URLs under Linux 
--HG--
branch : develop
 9 years ago
kaetemi 6c2490090d Merge with feature-export-assimp 
--HG--
branch : develop
 9 years ago
kervala 6d52aa7077 Fixed: Revert back TrapCrashInDebugger to false else VC++ can't intercept exceptions and we'll be unable to debug :( 
--HG--
branch : develop
 9 years ago
kervala c83ea11e84 Changed: Display basic information for OpenAL driver 
--HG--
branch : develop
 9 years ago
kervala f76e275e2c Changed: Temporary comment the line because XAudio2 returns an error if used 
--HG--
branch : develop
 9 years ago
kervala 817486538c Changed: Minor changes 
--HG--
branch : develop
 9 years ago
kervala 334f2b43c6 Fixed: Display title and artist name from ogg files in music player 
--HG--
branch : develop
 9 years ago
kervala f9c789e4db Fixed: Only open supported music formats in music player 
--HG--
branch : develop
 9 years ago
kaetemi 2c3d5454a1 This seems like a good idea as well, ref #254 
--HG--
branch : develop
 9 years ago
kaetemi 3d59db1021 Add some extra checks, ref #254 
--HG--
branch : develop
 9 years ago
kervala fb1d5134ba Changed: Minor changes 
--HG--
branch : develop
 9 years ago
kervala 9e88fa645b Changed: Support for integer types in Lua 5.3, fixes #253 
--HG--
branch : develop
 9 years ago
kervala 53f46eb5fa Changed: Support for integer types in Lua 5.3, fixes #253 
--HG--
branch : develop
 9 years ago
kervala 08d50dc725 Changed: Don't try to convert string to CRGBA if less than 3 integers 
--HG--
branch : develop
 9 years ago
kervala 630a22d428 Changed: Minor changes 
--HG--
branch : develop
 9 years ago
kervala aa3d209d39 Fixed: Crash in CLuaManager 
--HG--
branch : develop
 9 years ago
kervala a8d81c689b Changed: Support for integer types in Lua 5.3, fixes #253 
--HG--
branch : develop
 9 years ago
kervala 4a97f339a3 Changed: Replaced some NLMISC::strlwr by NLMISC::toLower 
--HG--
branch : develop
 9 years ago
Nimetu 76ee797e49 Add lua function CCtrlBase::setTooltipUtf8 to set tooltip from html page 
--HG--
branch : develop
 9 years ago
Nimetu 55e687e80d Fixed displaying utf8 string on <img> alt attr. 
--HG--
branch : develop
 9 years ago
kervala 1d11914192 Fixed: Include AvailabilityMacros.h before using macro MAC_OS_X_VERSION_10_6 
--HG--
branch : develop
 9 years ago
kervala 9525d24cd7 Fixed: Compilation with old libcurl versions 
--HG--
branch : develop
 9 years ago
kervala 5e07440a1e Changed: Display OpenGL version and GPU used in logs 
--HG--
branch : develop
 9 years ago
kervala 2f3aab5c74 Changed: Support for WGL_NV_gpu_affinity extension 
--HG--
branch : develop
 9 years ago
kervala d32a61d481 Changed: Updated OpenGL headers 
--HG--
branch : develop
 9 years ago
kervala e634e3ecf1 Fixed: Missing #endif 
--HG--
branch : develop
 9 years ago
kervala b56686b9b7 Changed: Release modes list under OS X 
--HG--
branch : develop
 9 years ago
kervala a49723178d Changed: Centralize OS X 10.6 check in NL_MAC_VERSION_10_6_UP 
--HG--
branch : develop
 9 years ago
kervala 2be81c5445 Changed: Replace int 3 asm by __debugbreak() 
--HG--
branch : develop
 9 years ago
kervala 2b155c2d50 Changed: Minor changes 
--HG--
branch : develop
 9 years ago
kervala 3ac728872e Fixed: Typos (renamed restaure to restore) 
--HG--
branch : develop
 9 years ago
Nimetu 84dfa01176 Fixed: CViewText not updating visible text when used by CCtrlTextButton 
--HG--
branch : develop
 9 years ago
Nimetu 8a55f1b1e9 Changed: Allow to set max concurrent cURL connections per CGroupHTML instance 
--HG--
branch : develop
 9 years ago
kervala cafc06e70c Fixed: Clang warnings 
--HG--
branch : develop
 9 years ago
kervala c4ea200633 Changed: Minor changes (spaces replaced by tabs) 
--HG--
branch : develop
 9 years ago
kervala 67a857e0fe Fixed: Use ShellExecute to open a document or URL as primary method, because second one doesn't work everytime 
--HG--
branch : develop
 9 years ago
kervala 716c4cdab5 Changed: Add support for Spanish 
--HG--
branch : develop
 9 years ago
kervala 9b231afa54 Fixed: Get system language code under OS X too and added method in NLMISC::CI18N 
--HG--
branch : develop
 9 years ago
kervala 285eeeab26 Fixed: Compilation errors when constant not defined 
--HG--
branch : develop
 9 years ago
kervala 9e74adee86 Changed: Minor changes 
--HG--
branch : develop
 9 years ago
kervala 93a03b5db0 Fixed: clang warnings 
--HG--
branch : develop
 9 years ago
kervala 1b211566bb Fixed: Unable to debug Ryzom while client is in fullscreen (bug with Windows 10?) 
--HG--
branch : develop
 9 years ago
Nimetu 4c8b2d3134 Add basic gif support to CBitmap (issue #238) 
--HG--
branch : develop
 9 years ago
kervala 6aaeedb077 Fixed: Crash when cursor is over WebPage, Outpost or WebIG at first frame, patch by kishan_grimout (issue #245) 
--HG--
branch : develop
 9 years ago
Nimetu f187421011 Fixed: Crash in CWidgetManager::sendClockTickEvent when element removed from _ClockMsgTargets (issue #250) 
--HG--
branch : develop
 9 years ago
kervala 12614d5ff4 Fixed: Avoid warnings of conflicts between Debug and Release DLLs 
--HG--
branch : develop
 9 years ago
kervala 9459224f23 Fixed: GetVersionEx deprecated under Windows 8.1+ and returns wrong version, replace it by RtlGetVersion from kernel 
--HG--
branch : develop
 9 years ago
kaetemi 8036d53411 Add pipeline v3 tool logger 
--HG--
branch : feature-export-assimp
 9 years ago
Nimetu 08e5345e14 Fix 'ah:' urls for untrusted domains 
--HG--
branch : develop
 9 years ago
kaetemi 7d53552979 Fix object viewer include issue 
--HG--
branch : develop
 9 years ago
kaetemi 5e428761c5 Fix freetype include order 
WINSDK added a fttypes.h header...

--HG--
branch : develop
 9 years ago
kaetemi 9a10f1413b Fix DXSDK include order 
--HG--
branch : develop
 9 years ago
Nimetu 15766d4d17 Add radio button type to CGroupHTML (issue 237) 
--HG--
branch : develop
 10 years ago
Nimetu 11ca61be54 Fix compiling on 32bit linux 
--HG--
branch : develop
 10 years ago
Nimetu ce4cb9c4f1 Fix sending and receiving cookies 
--HG--
branch : develop
 10 years ago
Nimetu a6cf9730be Fix possible curl handle leak 
--HG--
branch : develop
 10 years ago
Nimetu 26571de439 Fix compiling under windows 
--HG--
branch : develop
 10 years ago
Nimetu dc082f3921 Replace url parser with one less strict 
--HG--
branch : develop
 10 years ago
Nimetu ad3fac7b15 Make sure image src attribute matches local file or is absolute url 
--HG--
branch : develop
 10 years ago
Nimetu 2771185ef7 Fix utf8 tooltips on web links 
--HG--
branch : develop
 10 years ago
Nimetu 8e1ada36b0 Use cURL as http transport 
--HG--
branch : develop
 10 years ago
Nimetu c6535ee2fd Ensure that html is valid utf8 and that tags come in correct(ish) order 
--HG--
branch : develop
 10 years ago
Nimetu be95880a95 Remove libwww, only keep html entitites list 
--HG--
branch : develop
 10 years ago
Nimetu d1d0c0cf50 Parse local files (ingame help) with new html parser 
--HG--
branch : libxml2-html-parser
 10 years ago
Nimetu 1dc48143f3 Implement html parser using libxml2 
--HG--
branch : libxml2-html-parser
 10 years ago
Nimetu 5d4cbdce26 Remove libwww dependency from CGroupHTML::addLink() signature 
--HG--
branch : libxml2-html-parser
 10 years ago
Nimetu eeb881d49e Add span tag and bold, italic, underline, strikethrough styles to CGroupHTML 
--HG--
branch : develop
 10 years ago
Nimetu 55672485c9 Add embolden, oblique, underline, strikethrough styles to CViewText 
--HG--
branch : develop
 10 years ago
Nimetu c760b1e3d9 Add embolden, oblique font styles (NL3D) 
--HG--
branch : develop
 10 years ago
kaetemi 28bcfeb01c Flag windowed application when attempting window creation using 3D driver 
--HG--
branch : develop
 10 years ago
kaetemi 29f42ed5ab Some practical improvements for the report handling 
--HG--
branch : develop
 10 years ago
kaetemi 163abf31b8 Merge with feature-crashreport+develop 
--HG--
branch : develop
 10 years ago
kaetemi f2f7bad4c5 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 10 years ago
kaetemi ee32b56d87 Replace report functionality 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi 5a307cfa20 Replace report functionality 
--HG--
branch : feature-crashreport
 10 years ago
kervala c2139e95c0 Fixed: Compilation with GCC 
--HG--
branch : develop
 10 years ago
kervala 5e390364de Changed: Minor change 
--HG--
branch : develop
 10 years ago
kervala 93a708400e Fixed: Sort files in CFileContainer::addSearchPath too 
--HG--
branch : develop
 10 years ago
kervala c0e885aa6a Fixed: Skip .hg directories 
--HG--
branch : develop
 10 years ago
kervala 4daf4f5b5f Fix #208 linking against static libX11.a 
--HG--
branch : develop
 10 years ago
Nimetu c00ba3f2c1 Fix compilation 
--HG--
branch : develop
 10 years ago
kaetemi ea9e32f46d Merge with develop 
--HG--
branch : feature-crashreport+develop
 10 years ago
kaetemi a66204a03a Add isWindowedApplication to INeLContext 
--HG--
branch : develop
 10 years ago
kaetemi cf79f1bb1b Merge with develop 
--HG--
branch : feature-crashreport+develop
 10 years ago
kaetemi 3b59bbcf69 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 10 years ago
kaetemi d9dd425dc6 Cleanup Windows includes 
--HG--
branch : develop
 10 years ago
kaetemi 50e11b0536 Add _WIN32_WINNT fallback define 
--HG--
branch : develop
 10 years ago
kaetemi e201c90937 Remove redundant windows.h includes in NLMISC 
--HG--
branch : develop
 10 years ago
kaetemi e2dcc3b035 Categorize NLMISC project source files 
--HG--
branch : develop
 10 years ago
kaetemi 02e8100ea4 Fix sstream include 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi 6a48a2d199 Merge with feature-crashreport 
--HG--
branch : feature-crashreport+develop
 10 years ago
kaetemi 68120a53e7 Only in FINAL_VERSION 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi a548940b8c Default window title 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi e4e3f2019b Add function to set custom host url. Deprecate email callback function. Add some comments 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 92d692fe69 Merged in dfighter1985/ryzomcore/feature-crashreport (pull request #122) 
Crash reporter changes

--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 8bf372056f Use CMsgBoxDisplayer on non-windows platforms as well. 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi e27cdc7ac2 Merge with hotfix 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 955ef48460 Parametrize crash reporter. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 cfe2d60350 More renames... 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 24aa500d0b Launch the error report application instead of sending an email. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 3d9357637b Backed out from fdc0d40 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 7efbee6d0a Backed out from 5942903 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 4e00903dcc Back out from 5bb3dad 
--HG--
branch : feature-crashreport
 10 years ago
kaetemi 18d211f79b Merge with hotfix 
--HG--
branch : develop
 10 years ago
kaetemi 6e06b4e79e Merge with dfighter-tools 
--HG--
branch : hotfix
 10 years ago
kaetemi b120d68a98 Merge with hotfix 
--HG--
branch : develop
 10 years ago
dfighter1985 36ce53b1ba Merged in hotfix (pull request #117) 
Merge hotfix branch

--HG--
branch : develop
 10 years ago
dfighter1985 e130625cca A little cleanup of CMsgBoxDisplayer. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 ac6bda5084 A little cleanup of CMsgBoxDisplayer. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 1476bfe648 Use CMsgBoxDisplayer on platforms other than Windows as well. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 070dad8e53 Use CMsgBoxDisplayer on platforms other than Windows as well. 
--HG--
branch : hotfix
 10 years ago
kaetemi 1879a434f7 Visual Studio 2013 compilation support for NLGUI 
--HG--
branch : develop
 10 years ago
kaetemi 221267364d Visual Studio 2013 compilation support for NL3D 
--HG--
branch : develop
 10 years ago
kaetemi a15221b00d Visual Studio 2013 compilation support for NLSOUND 
--HG--
branch : develop
 10 years ago
kaetemi f5335f068d Visual Studio 2013 compilation support for NLMISC 
--HG--
branch : develop
 10 years ago
kaetemi cb986cba6f Visual Studio 2013 compilation support for NLPACS 
--HG--
branch : develop
 10 years ago
kaetemi 7ea4cff032 Visual Studio 2013 compilation support for NLNET 
--HG--
branch : develop
 10 years ago
kaetemi 6db8abf95c Visual Studio 2013 compilation support for NLMISC 
--HG--
branch : develop
 10 years ago
dfighter1985 f0869aa659 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 469e5583c1 Unfortunately on Windows argc and argv parameters are unreliable inside a Qt application, so I had to hardcode the report file name. :( 
--HG--
branch : hotfix
 10 years ago
dfighter1985 9518a80c99 Probably a good idea to look for rcerror as rcerror.exe on Windows. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 2fe77d719f Probably a good idea to look for rcerror as rcerror.exe on Windows. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 7302023777 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 
--HG--
branch : feature-crashreport
 10 years ago
dfighter1985 fea7cff850 CMsgBoxDisplayer should not present a dialog now, but write the report to a file then attempt to launch the error reporter application. Which ofc doesn't exist yet in this commit. 
--HG--
branch : hotfix
 10 years ago
kervala 6784301afc Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala 1690f777a1 Fixed: Unnamed semaphores are deprecated under OS X 
--HG--
branch : hotfix
 10 years ago
kervala e8b0765e7c Merge with hotfix 
--HG--
branch : develop
 10 years ago
kervala cdd35f58a1 Fixed: Warning with multichars to int conversion 
--HG--
branch : hotfix
 10 years ago
kervala 8472a6ff7f Fixed: Compilation 
--HG--
branch : hotfix
 10 years ago
kervala 943131b802 Changed: Replaced atoi and atof by NLMISC::fromString 
--HG--
branch : hotfix
 10 years ago
kervala b0937ec02b Changed: Minor changes 
--HG--
branch : hotfix
 10 years ago
kervala 3039428094 Fixed: Compilation warnings 
--HG--
branch : hotfix
 10 years ago
dfighter1985 225d786e7f Merged in hotfix (pull request #114) 
Merging hotfix branch

--HG--
branch : develop
 10 years ago
dfighter1985 46cc31d0d0 Handle relative paths when loading .worldedit files in World Editor. 
--HG--
branch : hotfix
 10 years ago
dfighter1985 7f35c5959a Merged in hotfix (pull request #111) 
Merge hotfix

--HG--
branch : develop
 10 years ago
dfighter1985 5e55a7b7bb Erm. Initialize Nel3D on other platforms too... 
--HG--
branch : hotfix
 10 years ago
dfighter1985 e21d926336 Merged hotfix 
--HG--
branch : develop
 10 years ago