6318 Commits (d8048eb352bacc347e697e7b00193bcdf8c40a66)

Author	SHA1	Message	Date
kervala	9c4225d74e	Fixed: Desktop files need to be executable ... --HG-- branch : develop	8 years ago
kervala	9af4edf07a	Changed: Increase timeout delay to 30s (just to avoid to wait forever) ... --HG-- branch : develop	8 years ago
kervala	f168dd17e2	Changed: Also check icon in same directory as executable ... --HG-- branch : develop	8 years ago
kervala	9557aff2cc	Fixed: Remove all directories from data excepted fonts one ... --HG-- branch : develop	8 years ago
kervala	5d4bdf8f60	Fixed: Don't fix height of operation dialog ... --HG-- branch : develop	8 years ago
kervala	9534b01d87	Changed: Updated translations ... --HG-- branch : develop	8 years ago
kervala	ad11871e7a	Changed: Simplify progress texts ... --HG-- branch : develop	8 years ago
kervala	c1d48c995a	Changed: Updated translations ... --HG-- branch : develop	8 years ago
kervala	07ddb63d61	Changed: Add a new line after description ... --HG-- branch : develop	8 years ago
kervala	a41ae065d8	Changed: Remove alternative formats for parameters (too verbose) ... --HG-- branch : develop	8 years ago
kervala	4b4b321169	Changed: Allow to compile Ryzom tools even without MySQL (mysql client library has compilation problems with VC++ 2015) ... --HG-- branch : develop	8 years ago
kervala	72ed8b2c61	Changed: Client directory already processed ... --HG-- branch : develop	8 years ago
kervala	e6fa251d92	Changed: Moved init code in sheets_packer.cpp ... Changed: Expand environment variables for other variables too Changed: Don't create log.log Changed: Added missing AGPL headers --HG-- branch : develop	8 years ago
kervala	33dfd39409	Changed: Use CCmdArgs for sheets_packer, see #281 ... --HG-- branch : develop	8 years ago
kervala	130b270380	Fixed: tga2dds doesn't generate mipmaps ... --HG-- branch : develop	8 years ago
kervala	b1f28ace36	Changed: Updated German translations ... --HG-- branch : develop	8 years ago
kervala	ec5deea3f0	Changed: Generate an exception if file is not a supported bitmap format ... --HG-- branch : develop	8 years ago
kervala	af1f02c53f	Changed: Download from "installer" directory now, see #279 ... --HG-- branch : develop	8 years ago
kervala	162e683803	Changed: New methods loadFromSettings and saveToSettings for CProfile and CServer, see #279 ... --HG-- branch : develop	8 years ago
kervala	1ce480a809	Changed: Minor change ... --HG-- branch : develop	8 years ago
kervala	3c4f5bfd4c	Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp ... --HG-- branch : develop	8 years ago
kervala	67f1797f6d	Changed: Updated German translations ... --HG-- branch : develop	8 years ago
kervala	536483f8a7	Changed: Factorize saving to right bitmap format ... --HG-- branch : develop	8 years ago
kervala	35b4a3d98a	Changed: Minor changes ... --HG-- branch : develop	8 years ago
kervala	39275558c0	Changed: Simplify outString (a simple printf should be enough) ... --HG-- branch : develop	8 years ago
kervala	20f4825686	Changed: Use CCmdArgs for build_interface ... --HG-- branch : develop	8 years ago
kervala	ed3a5e577f	Changed: Link to Version.lib, see #279 ... --HG-- branch : develop	8 years ago
kervala	f5ba2e2ff5	Changed: Implements shouldCopyInstaller() based on version from executable, see #279 ... --HG-- branch : develop	8 years ago
kervala	ba8673432b	Changed: Use getVersionFromExecutable in CProfilesDialog, see #279 ... --HG-- branch : develop	8 years ago
kervala	d6b0f49db2	Changed: One second timeout to get version, see #279 ... --HG-- branch : develop	8 years ago
kervala	8b2d787c77	Changed: Implement --version/-v ourself and process it before loading config, see #279 ... --HG-- branch : develop	8 years ago
kervala	f824bf0b48	Changed: New method to get executable version, see #279 ... --HG-- branch : develop	8 years ago
kervala	eb219b0c2b	Changed: Display an better text for status code 307, see #279 ... --HG-- branch : develop	8 years ago
kervala	6447e9794e	Changed: Remove certificates in data (they should be in gamedev.bnp now), see #279 ... --HG-- branch : develop	8 years ago
kervala	cd9abbcaae	Fixed: Stalling interface when an error occurs when downloading, see #279 ... --HG-- branch : develop	8 years ago
kervala	36b106e2ab	Changed: German translations, see #279 ... --HG-- branch : develop	8 years ago
Nimetu	02dd8db21f	Added: Lua function to render html string as new webpage ... --HG-- branch : develop	8 years ago
kervala	338c1883bc	Fixed: Don't ask confirmation ... --HG-- branch : develop	8 years ago
kervala	0b6546244d	Fixed: Missing ENDIF() ... --HG-- branch : develop	8 years ago
kervala	cb92380966	Changed: Install Upgrade scripts ... --HG-- branch : develop	8 years ago
kervala	abde821537	Added: upgd_nl.bat for Windows ... --HG-- branch : develop	8 years ago
kervala	42021fb7b4	Fixed: Interface stalled when adding new profile, see #279 ... --HG-- branch : develop	8 years ago
kervala	7cf531c1a3	Changed: Delete ryzom_installer_uninstalling_old_client when old client is uninstalled, see #279 ... --HG-- branch : develop	8 years ago
kervala	f1a9a44028	Fixed: Use translated size units, see #279 ... --HG-- branch : develop	8 years ago
kervala	f17e0c2dc1	Changed: Moved CCOMHelper to utils.h/cpp, see #279 ... --HG-- branch : develop	8 years ago
kervala	1e474e9ebd	Fixed: Unable to create shortcuts, see #279 ... --HG-- branch : develop	8 years ago
kervala	91221fd4ce	Fixed: Wrong French translation (copy-paste...), see #279 ... --HG-- branch : develop	8 years ago
kervala	26997cfddf	Fixed: Wrong path for PCH ... --HG-- branch : develop	8 years ago
kervala	dc8f74ba39	Fixed: Update client.cfg after it's copied, see #279 ... --HG-- branch : develop	8 years ago
kervala	4acc2afd3a	Changed: Move windows and dialog to foreground, see #279 ... --HG-- branch : develop	8 years ago
kervala	af26339d00	Fixed: Minor problems in French translations, see #279 ... --HG-- branch : develop	8 years ago
kervala	cd20d2e486	Fixed: Conflicts with member variables, see #279 ... --HG-- branch : develop	8 years ago
kervala	933bda5fbb	Removed: Useless files ... --HG-- branch : develop	8 years ago
kervala	3790fa413e	Changed: Reorganize Ryzom Configuration structure ... --HG-- branch : develop	8 years ago
kervala	a8ca0de9f8	Changed: Fix some files not deleted, see #279 ... --HG-- branch : develop	8 years ago
kervala	2de0cd6e25	Changed: Use 7z extension for 7z files, see #279 ... --HG-- branch : develop	8 years ago
kervala	d1a2f27414	Changed: Reenable Debug menus in Debug, see #279 ... --HG-- branch : develop	8 years ago
kervala	dc2dad8c77	Changed: Removed extraneous spaces ... --HG-- branch : develop	8 years ago
kervala	e4d3407be5	Changed: Fix the temporary directory, see #279 ... --HG-- branch : develop	8 years ago
kervala	271999e98f	Changed: Use a temporary file to check if we're uninstalling old client, see #279 ... --HG-- branch : develop	8 years ago
kervala	afb07586d3	Changed: Delete previously copied Ryzom Installer from TEMP directory, see #279 ... --HG-- branch : develop	8 years ago
kervala	b4f1f0868c	Changed: Launch upgrade script from 7z or ZIP archives if present, see #279 ... --HG-- branch : develop	8 years ago
kervala	d2e3a795d8	Changed: Create or update client.cfg, see #279 ... --HG-- branch : develop	8 years ago
kervala	172b506b1e	Changed: Best estimation for uncompressed data size, see #279 ... --HG-- branch : develop	8 years ago
kervala	122066e7ee	Changed: Use default Qt translations from QRC ... --HG-- branch : develop	8 years ago
kervala	47654fcd9a	Changed: Use 7z files for clients too, see #279 ... --HG-- branch : develop	8 years ago
kervala	7b4ab5efa7	Changed: Call setUninstallingOldClient before, see #279 ... --HG-- branch : develop	8 years ago
kervala	b7d37b71e3	Fixed: Compilation without PCH ... --HG-- branch : develop	8 years ago
kervala	5b5925f529	Fixed: Compilation without PCH ... --HG-- branch : develop	8 years ago
kervala	7422334e97	Changed: Only call CoUninitialize if CoInitialize(Ex) succeeded ... --HG-- branch : develop	8 years ago
kervala	98ed4382d0	Changed: Other translations placeholder, see #279 ... --HG-- branch : develop	8 years ago
kervala	e24e1c5957	Changed: French translations, see #279 ... --HG-- branch : develop	8 years ago
kervala	b214ed3d7c	Changed: Put source location in .TS files, see #279 ... --HG-- branch : develop	8 years ago
kervala	3bf24e05f1	Changed: Improved English texts (thanks to Cerulean!), see #279 ... --HG-- branch : develop	8 years ago
kervala	0dc4e37194	Changed: Don't need English translation anymore, see #279 ... --HG-- branch : develop	8 years ago
kervala	ba5574624a	Fixed: Don't restart Installer if in Debug, see #279 ... --HG-- branch : develop	8 years ago
kervala	cf5a1a5a85	Fixed: Browse buttons were freezing the application, see #279 ... --HG-- branch : develop	8 years ago
kervala	75d3db65e8	Fixed: Only ask once if user want to uninstall Ryzom, see #279 ... --HG-- branch : develop	8 years ago
kervala	7191bf1b41	Changed: Disable Settings and Uninstall menus (only there for debugging purposes), see #279 ... --HG-- branch : develop	8 years ago
kervala	742f8ab2e4	Changed: Disable button if executable not found, see #279 ... --HG-- branch : develop	8 years ago
kervala	fb934818a7	Fixed: Only ask once if user want to uninstall Ryzom, see #279 ... --HG-- branch : develop	8 years ago
kervala	5050a2bfa0	Fixed: Infinite loop when clicking on OK in profiles dialog, see #279 ... --HG-- branch : develop	8 years ago
kervala	32f682d5dc	Fixed: Compilation under OS X in 32 bits ... --HG-- branch : develop	8 years ago
kervala	aacb492c30	Changed: Updated glext.h ... --HG-- branch : develop	8 years ago
kervala	dca429c0b5	Fixed: Don't put downloaded files in quarantine under OS X ... --HG-- branch : develop	8 years ago
kervala	fc202e4034	Changed: Minor change ... --HG-- branch : develop	8 years ago
kervala	49abad7028	Fixed: Bug where exedll.bnp wasn't downloaded ... --HG-- branch : develop	8 years ago
kervala	243f9bc9bd	Changed: Wrong filename for packed sheets BNP, see #279 ... --HG-- branch : develop	8 years ago
kervala	508b5fdd24	Changed: QDir.cd already checks if directory exists, see #279 ... --HG-- branch : develop	8 years ago
kervala	400c17826e	Changed: Added getGroundZ to develop branch too ... --HG-- branch : develop	8 years ago
kervala	eb878d97d1	Fixed: Compilation under macOS 10.12 ... --HG-- branch : develop	8 years ago
kervala	53290cb212	Changed: Initialize ARBFragmentShader to false if DisableHardwarePixelProgram is set ... --HG-- branch : develop	8 years ago
kervala	8f7a28f5c9	Changed: Get length of song in FMod driver too (issue #59) ... --HG-- branch : develop	8 years ago
Nimetu	ee128cba1e	Changed: Implement mp3 player playlist ... --HG-- branch : develop	8 years ago
Nimetu	f2dfd3cd8e	Changed: Also return song length with title ... --HG-- branch : develop	8 years ago
Nimetu	c2226fe3ff	Fixed: Adding songs from wrong list ... --HG-- branch : develop	8 years ago
kervala	aa39c4fccc	Changed: Use %~X instead of %X because it removes double quotes ... --HG-- branch : develop	8 years ago
kervala	de109486b2	Changed: Remove unneeded double quotes in batch file ... --HG-- branch : develop	8 years ago
Nimetu	b6c03d5df8	Fixed: Save mp3 player volume to icfg ... --HG-- branch : develop	8 years ago
Nimetu	439916fae8	Changed: Make media player to play songs from music directory (issue #59) ... --HG-- branch : develop	8 years ago
kervala	7e1f006647	Changed: Relaunch Installer when installed/migrated, see #279 ... --HG-- branch : develop	8 years ago
kervala	373654ea46	Changed: Rerun installer from TEMP under Windows, see #279 ... --HG-- branch : develop	8 years ago
kervala	2bc1e26868	Changed: Check modification time of Installer to determine if it must be copied again, see #279 ... --HG-- branch : develop	8 years ago
kervala	78efe0a895	Changed: Try to load config file everytime, see #279 ... --HG-- branch : develop	8 years ago
kervala	bb58710623	Added: CProfile and CServer classes have their own sources, see #279 ... --HG-- branch : develop	8 years ago
kervala	0f587c079d	Fixed: Save config after choosing if we should uninstall previous version, see #279 ... --HG-- branch : develop	8 years ago
kervala	378ae6ecbb	Fixed: Missing Q_OBJECT, see #279 ... --HG-- branch : develop	8 years ago
kervala	fbd2c86629	Changed: Computes size of downloaded files, see #279 ... --HG-- branch : develop	8 years ago
kervala	29caab3ae7	Changed: Always copy installer if different, see #279 ... --HG-- branch : develop	8 years ago
kervala	4e70717251	Fixed: Wrong name of packed sheets BNP, see #279 ... --HG-- branch : develop	8 years ago
kervala	7ee609ae85	Changed: Allow to get size of a directory recursively or not, see #279 ... --HG-- branch : develop	8 years ago
kervala	8580daa0a1	Changed: Minor changes ... --HG-- branch : develop	8 years ago
kervala	2c6bbb7124	Fixed: Wrong variable names ... --HG-- branch : develop	8 years ago
Vinicius Arroyo	b9bc6e91bd	fixes wrong initialization of max number of objects and npc spaws in egs ... --HG-- branch : viniciusarroyo/fixes-wrong-initialization-of-max-number-1470835250351	8 years ago
kervala	a25697fbda	Changed: Create a backup if version of default config is incremented, see #279 ... --HG-- branch : develop	9 years ago
kervala	ca02500271	Changed: Minor changes, see #279 ... --HG-- branch : develop	9 years ago
kervala	fd861467b6	Changed: Display directories in Settings, see #279 ... --HG-- branch : develop	9 years ago
kervala	388cb6445a	Fixed: Include initguid.h to avoid linking against dxguid.lib ... --HG-- branch : develop	9 years ago
kervala	e150d7234f	Added: Translations for Ryzom Installer, see #279 ... --HG-- branch : develop	9 years ago
kervala	8ba09b0c56	Changed: Winch Gate instead of Winchgate ... --HG-- branch : develop	9 years ago
kervala	7d06821c96	Fixed: Wrong checks, see #279 ... --HG-- branch : develop	9 years ago
kervala	ac381ea055	Changed: Get language and installation directory from registry, see #279 ... --HG-- branch : develop	9 years ago
kervala	8516c14b04	Changed: getInstallerFullPath() returns only directory, see #279 ... --HG-- branch : develop	9 years ago
kervala	419131091c	Changed: Delete installer files in TEMP directory after a reboot, see #279 ... --HG-- branch : develop	9 years ago
kervala	626eba195d	Changed: List all required files and copy them, see #279 ... --HG-- branch : develop	9 years ago
kervala	6e8671c55a	Changed: Read default ryzom_installer.ini from QRC, see #279 ... --HG-- branch : develop	9 years ago
kervala	ab828febbb	Changed: 64 bits clients only available since Vista under Windows, see #279 ... --HG-- branch : develop	9 years ago
kervala	30aa93d55a	Changed: Use PNG icons under Linux, see #279 ... --HG-- branch : develop	9 years ago
kervala	e5db49b990	Merge ... --HG-- branch : develop	9 years ago
kervala	7738b33675	Fixed: Disable STLport by default when using a recent version of VC++ ... --HG-- branch : develop	9 years ago
kervala	49607ddfb9	Changed: Check default installer.ini in different places, see #279 ... --HG-- branch : develop	9 years ago
kervala	fffce0ca58	Fixed: When migrating from client 2.1 to 3.0, client_default.cfg is deleted because it exists in several unfiltered BNP, see #279 ... --HG-- branch : develop	9 years ago
kervala	de01e9e559	Changed: Create shortcut to installer, see #279 ... --HG-- branch : develop	9 years ago
kervala	3e9a3404d1	Changed: Delete and create shortcuts, see #279 ... --HG-- branch : develop	9 years ago
kervala	db1a7fbad3	Changed: Replace more variables, see #279 ... --HG-- branch : develop	9 years ago
kervala	7f70f26436	Changed: Create all profiles shortcuts at once, see #279 ... --HG-- branch : develop	9 years ago
kervala	b5512d8311	Changed: Create .desktop file under Linux, see #279 ... --HG-- branch : develop	9 years ago
Nimetu	7aeedf7ad4	Fixed: Bad typo ... --HG-- branch : develop	9 years ago
kervala	0f772c8605	Changed: Fix text align in patch windows, see #280 ... --HG-- branch : develop	9 years ago
kervala	5097e05d51	Added: New version of "DejaVu Sans" fonts (and monospace version) ... --HG-- branch : develop	9 years ago
Nimetu	357973aa10	Added: font style to <pre> element ... --HG-- branch : develop	9 years ago
Nimetu	fe3601d664	Added: font-family style option ... --HG-- branch : develop	9 years ago
Nimetu	9fb14c42d8	Added: Monospace font options ... --HG-- branch : develop	9 years ago
Nimetu	58bf225891	Changed: Support custom font ... --HG-- branch : develop	9 years ago
Nimetu	afc08d2efd	Added: Possible to use multiple fonts at the same time ... --HG-- branch : develop	9 years ago
Nimetu	91c9594a5a	Fixed: Wrong align on info window on character creation screen. ... --HG-- branch : develop	9 years ago
Nimetu	ef703ed6de	Fixed: Double tooltip on web image links ... --HG-- branch : develop	9 years ago
kervala	c57d77c1ba	Changed: Fix right text align by Info Window (patch by Riasan) ... --HG-- branch : develop	9 years ago
kervala	b4d1f7febe	Fixed: Typos ... --HG-- branch : develop	9 years ago
kervala	0e2d475ab2	Changed: Fox right text align by map and respawn window (patch by Riasan) ... --HG-- branch : develop	9 years ago
Nimetu	bc98a23af3	Fixed: Re-add handsbar horizontal mode ... --HG-- branch : develop	9 years ago
kervala	d4a9b63540	Changed: Apply changes from default interface to Syphox one ... --HG-- branch : develop	9 years ago
kervala	8e0846e16f	Changed: Bad Position of Text after fix the Text High (by Riasan) ... --HG-- branch : develop	9 years ago
Nimetu	8f1da052a2	Changed: Allow windowed mode to span over multiple desktops ... --HG-- branch : develop	9 years ago
Nimetu	42a7d602af	Changed: If char keys/icfg file does not exist, use shared keys/icfg file ... --HG-- branch : develop	9 years ago
kervala	438d637f66	Changed: Apply changes from default interface to Syphox one ... --HG-- branch : develop	9 years ago
kervala	fc1685af2c	Fixed: Compilation under Linux ... --HG-- branch : develop	9 years ago
kervala	2db7ca9729	Changed: Use std::numeric_limits instead of ~0 ... --HG-- branch : develop	9 years ago
kervala	da94a077b3	Fixed: Launch old Uninstaller after copying old profile ... --HG-- branch : develop	9 years ago
kervala	6d1e72c748	Changed: Only copy installer in TEMP if uninstalling ... --HG-- branch : develop	9 years ago
kervala	fb4461f00b	Changed: Delete downloaded files in uninstaller ... --HG-- branch : develop	9 years ago
kervala	8d3ca27424	Changed: Don't need to hardcode a text offset because the old font was not aligned ... --HG-- branch : develop	9 years ago
kervala	766989a0b3	Fixed: Better alignment of text ... --HG-- branch : develop	9 years ago
kervala	b02321e36f	Fixed: Wrong alignment of text in edit boxes ... --HG-- branch : develop	9 years ago
kervala	9361a70549	Fixed: Wrong alignment of text on character selection screen ... --HG-- branch : develop	9 years ago
kervala	c6f3c0fb73	Fixed: Wrong alignment of text on login screen ... --HG-- branch : develop	9 years ago
kervala	58f0ee5e9e	Fixed: The height of a CViewText was wrong in some cases because "|" is not the tallest character of the current font (ryzom.ttf) ... --HG-- branch : develop	9 years ago
kervala	4e761f69d6	Changed: Use toString instead of std::stringstream ... --HG-- branch : develop	9 years ago
Nimetu	69f956583a	Added: HTML css hsl(), hsla() color ... --HG-- branch : develop	9 years ago
Nimetu	c05fcd9b34	Added: HTML css rgb() and rgba() color ... --HG-- branch : develop	9 years ago
Nimetu	5db76bfe99	Added: HTML #RGBA color ... --HG-- branch : develop	9 years ago
Nimetu	07a68281a5	Fixed: Inconsistent html color parsing ... --HG-- branch : develop	9 years ago
kervala	36a4c6dce7	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	061ead00f4	Changed: Computes size of servers ... --HG-- branch : develop	9 years ago
kervala	443355b6c8	Changed: Use application name instead of hardcoded value ... --HG-- branch : develop	9 years ago
kervala	bea8c9bfa1	Changed: Minor change ... --HG-- branch : develop	9 years ago
kervala	0808ab8d3f	Changed: Create client shortcuts for profile ... --HG-- branch : develop	9 years ago
kervala	50d73127cb	Changed: Update Add/Remove program ... --HG-- branch : develop	9 years ago
kervala	7b6dd8f031	Changed: Use ID instead of index for profile and server ... --HG-- branch : develop	9 years ago
kervala	cb9acedb72	Changed: Create shortcut in menu for Installer ... --HG-- branch : develop	9 years ago
kervala	f27b388b11	Changed: Delete menu directory when uninstalling Installer ... --HG-- branch : develop	9 years ago
kervala	b6722dba24	Fixed: Close dialog when clicking on Abort ... --HG-- branch : develop	9 years ago
kervala	a7ca5eaac2	Changed: Support old and new data files ... --HG-- branch : develop	9 years ago
kervala	7dac03f6ec	Changed: More helpers ... --HG-- branch : develop	9 years ago
kervala	4494dc42bc	Changed: Use SComponents for added or removed components ... --HG-- branch : develop	9 years ago
kervala	438744f3bf	Changed: Copy Installer in TEMP directory under Windows (to be able to uninstall it) ... --HG-- branch : develop	9 years ago
kervala	83c97c6c36	Changed: Init CSystemUtils in INelContext ... --HG-- branch : develop	9 years ago
kervala	5980e34b78	Changed: Use translations from COperationDialog ... --HG-- branch : develop	9 years ago
kervala	4b6ed1ed36	Fixed: Create links under Windows ... --HG-- branch : develop	9 years ago
kervala	10c62f1147	Changed: Use same directory as installer if downloading files ... --HG-- branch : develop	9 years ago
kervala	f6afed94ef	Changed: Minor change ... --HG-- branch : develop	9 years ago
kervala	3d120ed9e6	Changed: Extract data archive ... --HG-- branch : develop	9 years ago
kervala	2a437f6cdb	Fixed: Download of data and client ... --HG-- branch : develop	9 years ago
kervala	a57cfa0e30	Changed: Put installer.ini in same directory as other local files ... --HG-- branch : develop	9 years ago
kervala	1a0c61e743	Fixed: Start client from server root directory ... --HG-- branch : develop	9 years ago
kervala	640489e3da	Fixed: Don't forget to expand variables un client names ... --HG-- branch : develop	9 years ago
kervala	a981cfbfe5	Changed: Display client version on the same line as filename and add a Default button to use default client ... --HG-- branch : develop	9 years ago
kervala	a8fac8f8e9	Changed: Under Linux, it's recommended to put user application data in ~/.local/share ... --HG-- branch : develop	9 years ago
Nimetu	7e488219a7	Changed: Add scrollbar to macro commands list ... --HG-- branch : develop	9 years ago
kervala	306aae7af9	Changed: Only display virtual screen size if DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag is defined ... --HG-- branch : develop	9 years ago