kervala
53f2292613
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
19c149b5f3
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
d4c8f5760b
Fixed: Typo in translation key
...
--HG--
branch : compatibility-develop
9 years ago
kervala
8f6a72e86f
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
e785de2a6e
Fixed: Typo
...
--HG--
branch : develop
9 years ago
kervala
7ed352ca8c
Fixed: Wrong locale under Linux
...
--HG--
branch : develop
9 years ago
kervala
5837c14e64
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
depyraken
96fd182335
add isloopbackIPAddress prototype to code/nel/include/nel/net/inet_address.h
...
add isloopbackIPAddress to code/nel/src/net/inet_address.cpp
add IPv4&IPv6 loopback IP addresses to localAddresses
In code/nel/src/net/unified_network.cpp:
replace is127001 calls by isloopbackIPAddress
change wrong comments about default network id (nid = 0xFF)
When the selected connectionId is not valid
warnings are not triggered anymore when using default network (nid = 0xFF): the logs were full of warnings and the server was lagging
When nid = 0xFF, the new connectionId is stored into DefaultNetwork
When nid <> 0xFF, the new connectionId is stored into NetworkConnectionAssociations[nid]
--HG--
branch : develop
9 years ago
Nimetu
37ea9de8ad
Added: AppZone translations
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
e2d1213708
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
2eb1d7b293
Added: AppZone and WebBrowser components
...
--HG--
branch : develop
9 years ago
kervala
05ca6f74c6
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
89532b2afb
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
...
--HG--
branch : develop
9 years ago
kervala
7bcde43a63
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
55de2f0bd2
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
...
--HG--
branch : develop
9 years ago
kaetemi
f767e7a488
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kaetemi
bbec2c5b33
Fix random thunder activation caused by rounding error in setup interpolation
...
--HG--
branch : develop
9 years ago
kaetemi
198323b9b5
Compile fix
...
--HG--
branch : develop
9 years ago
kervala
6b2e47e59e
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
89be3e39de
Fixed: Clang warnings
...
--HG--
branch : develop
9 years ago
kervala
dadfb51257
Fixed: Use presets from client_default.cfg for client_config_qt
...
--HG--
branch : develop
9 years ago
kervala
264e8be1a2
Changed: Try to load Steam DLL without path if fails
...
--HG--
branch : compatibility-develop
9 years ago
kervala
833976be5b
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
0d773e3e79
Fixed: Use nlfopen in tools and servers
...
--HG--
branch : develop
9 years ago
kervala
e191e1675b
Fixed: Define _DARWIN_UNLIMITED_STREAMS to fix setrlimit under OS X
...
--HG--
branch : develop
9 years ago
kervala
1eddef3c93
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
a7b3532687
Changed: Minor changes
...
--HG--
branch : develop
9 years ago
kervala
f376317f10
Fixed: Compilation
...
--HG--
branch : develop
9 years ago
kervala
bbaaa17d7a
Changed: Load Steam DLL just after initializing logs and before loading config
...
--HG--
branch : compatibility-develop
9 years ago
kervala
d99cf4bd95
Fixed: Use language defined in Ryzom properties from Steam
...
--HG--
branch : compatibility-develop
9 years ago
kervala
410b9bcf55
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
cf20e21f83
Changed: Use named arguments in uiFilterMenuDynamic translation
...
--HG--
branch : develop
9 years ago
kervala
4074f095eb
Fixed: Move setrlimit after initializing logs
...
--HG--
branch : develop
9 years ago
kervala
40c7c82a2d
Changed: Removed wrong check
...
--HG--
branch : develop
9 years ago
kervala
05e0500aaf
Changed: Check if LC_NUMERIC is correct before loading or saving config files
...
--HG--
branch : develop
9 years ago
kervala
97647b2264
Fixed: Set numeric locale in CApplicationContext
...
--HG--
branch : develop
9 years ago
kervala
d7121b4b7a
Changed: Don't need to use Windows functions with locale because the bug also occurs under Linux and OS X
...
--HG--
branch : develop
9 years ago
kervala
94f4e901c9
Changed: Fix clang warnings
...
--HG--
branch : develop
9 years ago
kervala
6e816dfaa2
Changed: Init log before calling prelogInit()
...
--HG--
branch : develop
9 years ago
kervala
962b43d2bd
Fixed: Possible crashes if ov_info returns NULL
...
--HG--
branch : develop
9 years ago
kervala
a77fee685b
Changed: Implement CI18N::setSystemLanguageCode, if we must force it
...
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)
--HG--
branch : develop
9 years ago
kervala
0c0bac175f
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
114543ba07
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
1356c1d447
Fixed: Renamed ryzom_configuration to ryzom_configuration_qt under Linux
...
--HG--
branch : develop
9 years ago
kervala
413dd8eb93
Fixed: We need to restart client from the same startup directory as parent one
...
--HG--
branch : develop
9 years ago
kervala
8bc243ffe1
Changed: Removed some semicolons in Lua when useless
...
--HG--
branch : develop
9 years ago
kervala
c39190b38d
Changed: Use same algorithm as before Windows unicodes fixes (try to open the file instead of checking its attributes)
...
--HG--
branch : develop
9 years ago
kervala
5121cdb7d4
Changed: Use # in Lua to get the size of an array
...
--HG--
branch : develop
9 years ago
kervala
182a9201c3
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
d113bb7b10
Changed: Search client_default.cfg also in ETC_RYZOM_PREFIX
...
--HG--
branch : develop
9 years ago
kervala
b0d50dea69
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
f1b882c0f3
Changed: Removed useless dependencies on DirectX
...
--HG--
branch : develop
9 years ago
kervala
61934be39a
Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first
...
--HG--
branch : develop
9 years ago
kervala
c3d3024507
Changed: Remived useless semicolons
...
--HG--
branch : develop
9 years ago
kervala
2dd97967ff
Changed: Remove Hungarian because this language is not supported by Ryzom
...
--HG--
branch : develop
9 years ago
kervala
011e87b3bc
Changed: Updated Configuration translations
...
--HG--
branch : develop
9 years ago
kervala
888c21cd97
Changed: Fix typo
...
--HG--
branch : develop
9 years ago
kervala
27413888b3
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
13abb130bd
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
d340f00d01
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
61c33024b6
Changed: Updated Configuration translations
...
--HG--
branch : develop
9 years ago
kervala
bb67a604e6
Fixed: Wrong first and last names orders and some minor bugs
...
--HG--
branch : develop
9 years ago
kervala
efac9c97b1
Changed: Use more explicit variable names
...
--HG--
branch : develop
9 years ago
kervala
7366a1f994
Changed: Minor changes (spaces replaced by tabs)
...
--HG--
branch : develop
9 years ago
kervala
0a16b3b8dd
Changed: Sligthly changes
...
--HG--
branch : develop
9 years ago
kervala
0be32d3a25
Fixed: UTF-8 encoding
...
--HG--
branch : develop
9 years ago
kervala
7bfb43c25d
Changed: Updated translations for Ryzom Configuration
...
--HG--
branch : develop
9 years ago
kervala
30703b5591
Changed: Update shorcuts
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
95f6b154fb
Changed: Save when clicking on OK
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
d446dd3942
Changed: Update index in servers list
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
d34b434b23
Changed: Disable widgets if no profile selected
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
0d06721689
Changed: Read version from client and display it
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
a1ceaf0c5e
Changed: Use CServersModel
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
b98f625e7a
Changed: Methods to convert index from/to profile ID
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
733969f148
Changed: Minor changes
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
4a50cf1d3a
Changed: Read/write shortcuts
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
0828e1cc30
Changed: Use checkboxes for shortcuts
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
61b2a3e6f2
Added: ServersModel to manage servers list
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
81829bf73e
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
9d48b2923b
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
992b624d4c
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
691c8cdbd3
Changed: Use QString::number() instead of QString("%1") to convert an int to QString
...
--HG--
branch : develop
9 years ago
kervala
587b63e1d1
Fixed: Use full path to launch Ryzom client and pass profile argument
...
--HG--
branch : develop
9 years ago
kervala
21a84a3ed4
Changed: Declare CCmdArgs outside of main() to be able to use it in other files
...
--HG--
branch : develop
9 years ago
kervala
13851e3df5
Fixed: 0x0 is Auto mode
...
--HG--
branch : develop
9 years ago
kervala
f258a9695a
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
8f82ad85db
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
b9231adb78
Fixed: ForceDXTC is not to disable compression but force it
...
--HG--
branch : develop
9 years ago
kervala
e4f8bb0e16
Changed: Use MiB for RAM
...
--HG--
branch : develop
9 years ago
kervala
c0958ab0b5
Fixed: Determine path of client.cfg and client_default.cfg
...
--HG--
branch : develop
9 years ago
kervala
e0be334456
Changed: Create new client.cfg
...
--HG--
branch : develop
9 years ago
kaetemi
b9d366372e
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kaetemi
4762b33ac0
Fix thunder update
...
--HG--
branch : develop
9 years ago
kaetemi
c8646b26d1
Fix rounding error in _RyzomDay and _RyzomTime calculation
...
--HG--
branch : develop
9 years ago
kervala
5c3f5e841c
Changed: Write a warning instead of error
...
--HG--
branch : develop
9 years ago
kervala
faae2973ac
Fixed: With new iOS versions (and perhaps OS X), locale can contains country code
...
--HG--
branch : develop
9 years ago
kervala
41176a7d02
Fixed: OpenGL ES driver compilation
...
--HG--
branch : develop
9 years ago
kervala
8dec2fbb54
Changed: Random names generator updated by Osquallo
...
--HG--
branch : develop
9 years ago
kaetemi
0c2ff923b7
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kaetemi
48a120b21f
Fix curl crash
...
--HG--
branch : develop
9 years ago
kervala
96c1328bef
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
eedfe1471b
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
6686503e51
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
124bfac9f0
Improved Luabind CMake module, fixes #262 and fixes #263
...
--HG--
branch : develop
9 years ago
kervala
d6e97a9ebc
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
2f23fabd02
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
0db2ed85ca
Changed: Temporarily disable Spanish and Russian translations (not yet ready)
...
--HG--
branch : compatibility-develop
9 years ago
kervala
846be58379
Changed: Better warning
...
--HG--
branch : develop
9 years ago
kervala
f445789fb0
Changed: Profiles dialog code
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
5a11b80b9f
Added: Profiles model class
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
ae88268333
Changed: Create a typedef for lists of profiles and servers
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
d4f6be1578
Changed: Use "arguments" instead of "parameters"
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
46f6df3310
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
76d83a5890
Improved Luabind CMake module, fixes #263
...
--HG--
branch : develop
9 years ago
kervala
865bece41c
Changed: Random names generator updated by Osquallo
...
--HG--
branch : develop
9 years ago
kervala
efe7de773f
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
5d3796d225
Lua 5.3 support for Fedora 22+, fixes #262
...
--HG--
branch : develop
9 years ago
Nimetu
261d9c789b
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
1d0d1a505c
Added: Possibility to set text as grayed in combo box
...
--HG--
branch : develop
9 years ago
Nimetu
b7a3575746
Changed: Update translations
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
5c7eeb6d32
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
bc8fd9fe2b
Added: Horizontal mode to second action bar
...
--HG--
branch : develop
9 years ago
kervala
0fa672f5f5
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
31bdbb1fdc
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
81408bbc5a
Fixed: Missing translation for bytes in patcher
...
--HG--
branch : develop
9 years ago
kervala
dac5a3b50f
Changed: Slots for buttons
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
767ab0b83c
Changed: Renamed configurations to profiles
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
d382cc2cc3
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
c182708cd0
Changed: Escape Linux upgrade script as well
...
--HG--
branch : develop
9 years ago
kervala
4519893d78
Fixed: Loading PEM file
...
--HG--
branch : develop
9 years ago
kervala
f23c05c848
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
22b582fe46
Fixed: Escape paths with quotes under OS X
...
--HG--
branch : develop
9 years ago
kervala
0ee75e810a
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
29b03a445a
Changed: Try to load Steam DLL using absolute path
...
--HG--
branch : compatibility-develop
9 years ago
kervala
26722fb579
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
d39911345e
Fixed: Only use "open" if extension is app
...
--HG--
branch : develop
9 years ago
kervala
3ddefec294
Changed: Delete updt_nl.bat/sh only when patch enabled and after determining ClientRootPath
...
--HG--
branch : develop
9 years ago
kervala
eac2cec783
Fixed: Wrong check for OS X
...
--HG--
branch : develop
9 years ago
kervala
3f2d1da933
Added: Scripts launched after patch
...
--HG--
branch : develop
9 years ago
kervala
12f3abbaaf
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
0040fa888e
Fixed: Compilation under OS X
...
--HG--
branch : develop
9 years ago
kervala
e38af28d40
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
62104e31b1
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
a47d3845bd
Fixed: Compilation
...
--HG--
branch : develop
9 years ago
kervala
6e301d59cd
Merge with develop
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
92dfe1e2ff
Changed: Extract Windows and UNIX attributes from 7z headers
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
86bfb53ff2
Changed: Renamed configurations to profiles
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
f481a12799
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
6104011d11
Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape)
...
--HG--
branch : develop
9 years ago
kervala
b3b48a3ae3
Changed: New functions to convert arguments string from/to an array of strings
...
--HG--
branch : develop
9 years ago
kervala
76674c4fd4
Changed: Improve formatting of UNIX script
...
--HG--
branch : develop
9 years ago
kervala
58d9ba6c50
Fixed: Use / instead of \ under UNIX
...
--HG--
branch : develop
9 years ago
kervala
98bd20967d
Fixed: Use export under UNIX to make variables available in upgd_nl.sh too
...
--HG--
branch : develop
9 years ago
kervala
b897d9fe74
Fixed: Wrong patch categories
...
--HG--
branch : develop
9 years ago
kervala
f3352a9ccc
Added: Initial commit for Ryzom Installer (WIP)
...
--HG--
branch : feature-ryzom-installer
9 years ago
kervala
36ed03aa5a
Fixed: Typos in french translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
f8e46962e2
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
2b64e30aa2
Changed: Minor changes
...
--HG--
branch : develop
9 years ago
kervala
c0fe37ab8e
Fixed: Memory leak
...
--HG--
branch : develop
9 years ago
kervala
5123c48885
Changed: Updated translations
...
--HG--
branch : compatibility-develop
9 years ago
kervala
e23f32e902
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
79be594f54
Changed: Trim URL before to display it
...
--HG--
branch : develop
9 years ago
kervala
dc042a3739
Fixed: Implement alternate login system with LoginCustomParameters
...
--HG--
branch : compatibility-develop
9 years ago
kervala
e7645739a6
Fixed: Don't append empty login, password or shard ID to batch
...
--HG--
branch : develop
9 years ago
kervala
89d1c51408
Fixed: Use full path for client_default.cfg
...
--HG--
branch : develop
9 years ago
kervala
ad4857cfaa
Changed: Minor changes
...
--HG--
branch : develop
9 years ago
kervala
d01204e972
Changed: Updated german translations
...
--HG--
branch : compatibility-develop
9 years ago
Nimetu
a95c887534
Changed: Implement multi-row select box
...
--HG--
branch : develop
9 years ago
Nimetu
e2fca3a8f3
Added: http-equiv refresh
...
--HG--
branch : develop
9 years ago
Nimetu
a50689a885
Changed: Use multiline text for http errors
...
--HG--
branch : develop
9 years ago
kervala
c54cdb7543
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
dd15287d6c
Changed: Use a wchar_t buffer for registry
...
--HG--
branch : develop
9 years ago
kervala
bca35ec6e1
Changed: Updated world_editor_classes.xml
...
--HG--
branch : compatibility-develop
9 years ago
kervala
4985d4d724
Changed: PatchServer not used anymore, use PatchUrl instead
...
--HG--
branch : compatibility-develop
9 years ago
kervala
14f46e884b
Changed: Updated world_editor_classes.xml
...
--HG--
branch : develop
9 years ago
kervala
89f4131e8d
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
3dfcdb758a
Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)
...
--HG--
branch : develop
9 years ago
kervala
91f995b259
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
baf9f6c7f9
Changed: Make OpenSSL required
...
--HG--
branch : develop
9 years ago
kervala
537f6ab83e
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
18c5193fb9
Fixed: Compilation under Linux
...
--HG--
branch : develop
9 years ago
kervala
776542be27
Changed: Updated world_editor_classes.xml
...
--HG--
branch : compatibility-develop
9 years ago
kervala
3728c5d00e
Changed: Guild missions
...
--HG--
branch : compatibility-develop
9 years ago
kervala
e2d437e846
Changed: Minor changes
...
--HG--
branch : compatibility-develop
9 years ago
kervala
35e3ef1d68
Changed: Minor changes (replaced l: by L:)
...
--HG--
branch : develop
9 years ago
kervala
5284bd37f1
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
f698c31aa1
Changed: Allow to compile WITH_NEL_TESTS without compiling tools
...
--HG--
branch : develop
9 years ago
kervala
3e14025cf8
Changed: Include wang_hash.h in NLMISC files
...
--HG--
branch : develop
9 years ago
kervala
d18c7b24f5
Changed: Don't look for Qt5WinExtras in root CmakeLists.txt
...
--HG--
branch : develop
9 years ago
kervala
901759d039
Changed: Don't use DOS path under UNIX
...
--HG--
branch : develop
9 years ago
kervala
9a4156d9cf
Changed: Launch upgrade script even if we don't want to launch client
...
--HG--
branch : develop
9 years ago
kervala
bfe817f92c
Changed: Minor changes
...
--HG--
branch : develop
9 years ago
kervala
24dda2e7b9
Changed: Don't use SrcPath and DstPath anymore (ClientPatchPath and ClientRootPath are more explicit)
...
--HG--
branch : develop
9 years ago
kervala
4b023d1ace
Changed: Renamed DSTPATH to ROOTPATH and SRCPATH to UNPACKPATH and fixed paths with spaces
...
--HG--
branch : develop
9 years ago
kervala
aa15b96187
Changed: Add a 7 seconds pause under UNIX
...
--HG--
branch : develop
9 years ago
kervala
460708a015
Changed: Use L:/ path instead of R:/ for leveldesign
...
--HG--
branch : develop
9 years ago
kervala
291d37a3e5
Changed: Added NamingPolicyURL in client_default.cfg
...
--HG--
branch : compatibility-develop
9 years ago
kervala
ece1809a70
Merge with develop
...
--HG--
branch : compatibility-develop
9 years ago
kervala
ce382f87dc
Fixed: Compilation
...
--HG--
branch : develop
9 years ago
kervala
c6ac53598b
Changed: Renamed uiCP_Surame and uiCP_Name to uiCP_FirstName and uiCP_LastName
...
--HG--
branch : develop
9 years ago