2935 Commits (36b106e2aba0d6863674f4ddd6b7a29bc853c776)

Author	SHA1	Message	Date
Gary Preston	963ee5a66e	Allow bnp_make to process "if" and "ifnot" argumenets multiple times instead of ... accepting only one instance or each. --HG-- branch : develop	9 years ago
Cédric OCHS	c2e444774e	Merged in BWGaryP/ryzomcore/fix/bnp_make_call (pull request #134) ... Update BnpMake arguements to output bnp files to target folder/name using -o switch. --HG-- branch : develop	9 years ago
Gary Preston	45755dd86f	Update BnpMake arguements to output bnp files to target folder/name ... using -o switch. Exclude first element from package[1] which was used to build the targetBnp file rather than a file to be included within the bnp. --HG-- branch : fix/bnp_make_call	9 years ago
kervala	6e93a0d395	Fixed: Wrong return value for CCmdArgs::haveAdditionalArg ... --HG-- branch : develop	9 years ago
kervala	63a36fc2f8	Changed: Removed libxml2 dependencies from other targets ... --HG-- branch : develop	9 years ago
kervala	4c96c5a608	Fixed: Remove inherited dependency on libxml2 for all projects ... --HG-- branch : develop	9 years ago
kervala	093ee91656	Fixed: libxml2 dependencies ... --HG-- branch : develop	9 years ago
kervala	89319eb99c	Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...) ... --HG-- branch : develop	9 years ago
kervala	df22787f90	Changed: Added PCH for logic ... --HG-- branch : develop	9 years ago
kervala	af2f38612a	Fixed: Remove inherited dependency on libxml2 for all projects ... --HG-- branch : develop	9 years ago
kervala	7237736922	Changed: Make absolute program path (useful if launched from current directory under Linux) ... Changed: Set process name for logs --HG-- branch : develop	9 years ago
kervala	222544f902	Fixed: Display an error if adding more than once the same filename in BNP ... --HG-- branch : develop	9 years ago
kervala	0505395fd1	Fixed: toLower shouldn't transform a eszett to s ... --HG-- branch : develop	9 years ago
kervala	5892fb8c1c	Fixed: -o option of tga2dds for directory output ... --HG-- branch : develop	9 years ago
kervala	1ca826cda9	Changed: Use CBigFile to manage BNP and CCmdArgs for command-line in bnp_make ... --HG-- branch : develop	9 years ago
kervala	f8d45d01dc	Changed: Replace tabs by spaces ... --HG-- branch : develop	9 years ago
kervala	9aff198d70	Fixed: Return true if a required argument is found ... --HG-- branch : develop	9 years ago
kervala	7f69309e39	Fixed: Link to Qt ICO plugin ... --HG-- branch : develop	9 years ago
kervala	12d87b4914	Changed: Use CCmdArgs for tga2dds ... --HG-- branch : develop	9 years ago
kervala	e2cc9e622e	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	19aa093ea8	Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs ... --HG-- branch : develop	9 years ago
kervala	93e1289a77	Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..) ... --HG-- branch : develop	9 years ago
kervala	aff9cccd0c	Changed: Improve toString(const bool &val)... ... --HG-- branch : develop	9 years ago
kervala	a08cdce803	Fixed: Use icon under Windows ... --HG-- branch : develop	9 years ago
Nimetu	52dcf1a300	Changed: Use url from <base> element for relative urls ... --HG-- branch : develop	9 years ago
kervala	fa22852adb	Changed: Removed fromString(const char *, ...) because useless ... --HG-- branch : develop	9 years ago
kervala	5cc2b2865f	Changed: Local includes against system includes ... --HG-- branch : develop	9 years ago
kervala	00395d6b2e	Fixed: Compilation without PCH ... --HG-- branch : develop	9 years ago
kervala	5fb0c5d279	Removed: Binary file generated by VC++ ... --HG-- branch : develop	9 years ago
kervala	1864ad70db	Fixed: Some unit tests with fromString ... --HG-- branch : develop	9 years ago
kervala	e01f706ccc	Fixed: Updated with new changes ... --HG-- branch : develop	9 years ago
kervala	b91e3bdf0e	Changed: Improved CCmdArgs ... --HG-- branch : develop	9 years ago
kervala	c379c61ab7	Changed: Don't need to create it on heap ... --HG-- branch : develop	9 years ago
kervala	fc645a5668	Fixed: Import static platform plugin ... --HG-- branch : develop	9 years ago
kaetemi	fd950a692b	Faster Qt startup ... --HG-- branch : develop	9 years ago
Tobias Peters	48c7404c74	Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests ... --HG-- branch : issue/fix-failing-unit-tests	9 years ago
kervala	58d23bbe97	Fixed: Compilation with static Qt 5 ... --HG-- branch : develop	9 years ago
kervala	c5fbf56984	Fixed: Missing ++ ... --HG-- branch : develop	9 years ago
kervala	bb9ac688f6	Changed: Set CMP0020 NEW in root project ... --HG-- branch : develop	9 years ago
kervala	b3cfd5f6bb	Fixed: Use lua_tointeger under Lua 5.2 and prior versions ... --HG-- branch : develop	9 years ago
kervala	4886da5855	Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals ... --HG-- branch : develop	9 years ago
kervala	cd021fc4ef	Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) ... --HG-- branch : develop	9 years ago
kervala	c427bb216b	Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) ... --HG-- branch : develop	9 years ago
kervala	8b5dcc345d	Fixed: Link to X11 under Linux ... --HG-- branch : develop	9 years ago
kaetemi	9c687430c8	Update mask pixel format in panoply preview tool ... --HG-- branch : develop	9 years ago
kaetemi	8673d27a13	Add panoply preview tool ... --HG-- branch : develop	9 years ago
kaetemi	8cfaa89620	Separate window displayer message stringify ... --HG-- branch : develop	9 years ago
kaetemi	e4b72e63a1	More of the VS2015 stuff ... --HG-- branch : develop	9 years ago
kaetemi	f7d05ea8e4	VS2015 fixes for NeL Samples ... --HG-- branch : develop	9 years ago
kaetemi	9a0c6290a2	Fix another VS2015 warning ... --HG-- branch : develop	9 years ago
kaetemi	da02779588	More VS2015 fixes ... --HG-- branch : develop	9 years ago
kaetemi	3632ae4e64	Fix VS2015 warnings ... --HG-- branch : develop	9 years ago
kaetemi	9a477d976b	VS2015 compilation fixes ... --HG-- branch : develop	9 years ago
kervala	9a34434cf8	Fixed: Compilation ... --HG-- branch : develop	9 years ago
kervala	875224d277	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	c1d8d4e400	Changed: Invert version and help checks ... --HG-- branch : develop	9 years ago
kervala	c844a0bdd1	Fixed: Compilation ... --HG-- branch : develop	9 years ago
kervala	b7fe07d781	Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257 ... --HG-- branch : develop	9 years ago
kervala	57f216dc3e	Changed: Expand environment variables in paths read from cfg files ... --HG-- branch : develop	9 years ago
kervala	bd5f838d6d	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	d0c587e445	Changed: Remove duplicate lines ... --HG-- branch : develop	9 years ago
kervala	6a3292c600	Fixed: Convert .bank filenames with / and use existing CFile::fileExists ... --HG-- branch : develop	9 years ago
kervala	e1c14db5a0	Fixed: getLastSeparator should return std::string::size_type instead of an integer ... --HG-- branch : develop	9 years ago
kervala	a66fa8cc9c	Changed: Implement CPath::isAbsolutePath ... --HG-- branch : develop	9 years ago
kervala	af9610328f	Changed: Implement expandEnvironmentVariables function ... --HG-- branch : develop	9 years ago
kervala	ad36e59a71	Fixed: Save filenames in .bank with / instead of system separator ... --HG-- branch : develop	9 years ago
kervala	49ef5a1ed7	Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0 ... --HG-- branch : develop	9 years ago
kervala	59c06630cd	Changed: Table keys are integers ... --HG-- branch : develop	9 years ago
kervala	839928a57a	Fixed: In Lua, all integers are numbers and numbers can be converted to integers ... --HG-- branch : develop	9 years ago
Nimetu	ad8059c345	Fixed: Invalid image width/height on error ... --HG-- branch : develop	9 years ago
Nimetu	511a004827	Fixed: Wrong DD indent in nested list when tag is not closed ... --HG-- branch : develop	9 years ago
kervala	bb3726fd46	Fixed: Compilation of object_viewer_widget in static under Linux ... --HG-- branch : develop	9 years ago
kervala	3af2813fbf	Fixed: Compilation ... --HG-- branch : develop	9 years ago
kervala	14f48d821a	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	9ee32071d8	Fixed: Compilation under Linux ... --HG-- branch : develop	9 years ago
kervala	9e8cd07e4b	Changed: HAVE_X86_64 is defined or not ... --HG-- branch : develop	9 years ago
kervala	b3a392d559	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	59aff6a4bc	Changed: Added more fromString tests ... --HG-- branch : develop	9 years ago
kervala	245726f347	Changed: Don't need to use system API, NeL already has equivalent ... --HG-- branch : develop	9 years ago
kervala	ea5b041844	Fixed: Compilation with Qt 4 ... --HG-- branch : develop	9 years ago
kervala	ecb47bc2dc	Changed: Remove unused variable ... --HG-- branch : develop	9 years ago
kervala	0ef79083a0	Changed: Code simplification ... --HG-- branch : develop	9 years ago
kervala	80ae07c8b3	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	f323974dba	Changed: Don't fix files within panoply_maker, use textures_optimizer (but checks can be enabled) ... --HG-- branch : develop	9 years ago
kervala	6efce5ba59	Changed: Support for new key events ... --HG-- branch : develop	9 years ago
kervala	76744b18c7	Changed: Minor change ... --HG-- branch : develop	9 years ago
kervala	03c9c93fc1	Changed: Comments to support DXTC1a for textures with one level of transparency later ... --HG-- branch : develop	9 years ago
kervala	75eb7cb922	Changed: Compile tile_edit_qt and object_viewer_widget if WITH_QT5 is defined ... --HG-- branch : develop	9 years ago
kervala	ec7699aca9	Fixed: Compilation of object_viewer_qt with Qt 5 ... --HG-- branch : develop	9 years ago
kervala	af14cbe3aa	Fixed: Allow to select PNG and TGA for bitmaps ... --HG-- branch : develop	9 years ago
kervala	2923fe7c89	Fixed: Remove dependency on Pic (NeL manages TGA and PNG itself, reused code by Kaetemi) ... --HG-- branch : develop	9 years ago
kervala	fad179731a	Fixed: Compilation of tile_edit_qt with Qt 5 ... --HG-- branch : develop	9 years ago
Nimetu	8475f25e75	Changed: Refactor DL ... --HG-- branch : develop	9 years ago
Nimetu	639ce91e61	Fixed: Align UL, LI list style type marker outside content ... --HG-- branch : develop	9 years ago
Nimetu	6bcb153930	Fixed: DL list top margin ... --HG-- branch : develop	9 years ago
Nimetu	f95d445839	Fixed: DL list DD element indent ... --HG-- branch : develop	9 years ago
Nimetu	bbe9ca2b67	Changed: UL list style type depending on nested depth ... --HG-- branch : develop	9 years ago
Nimetu	298a659c6f	Changed: Merge UL and OL code ... --HG-- branch : develop	9 years ago
kervala	95404bd724	Fixed: Don't load grayscale textures as alpha ... --HG-- branch : develop	9 years ago
kervala	f2b43c2d7e	Changed: Added default checks for textures and masks (-t and -m) ... --HG-- branch : develop	9 years ago
kervala	dc5ddadcbb	Fixed: Alpha channel with 0 is correct, don't change it ... --HG-- branch : develop	9 years ago
kervala	9f761780f1	Changed: %u to format a uint ... --HG-- branch : develop	9 years ago
kervala	687301377e	Fixed: Instead of returning an error, convert the bitmap in RGBA ... --HG-- branch : develop	9 years ago
kervala	798cb1c7ce	Fixed: Alpha channel with 0 is correct, don't change it ... --HG-- branch : develop	9 years ago
kervala	f482f77179	Fixed: GCC warnings ... --HG-- branch : develop	9 years ago
kervala	ac57a464d4	Fixed: Converting AlphaLuminance to Luminance ... --HG-- branch : develop	9 years ago
kervala	0dc70105d5	Fixed: __rdtsc() under old versions of GCC ... --HG-- branch : develop	9 years ago
kervala	ae752f72d8	Changed: Define CLANG_VERSION is using clang compiler ... --HG-- branch : develop	9 years ago
kervala	0fe6ec67ba	Fixed: Compilation ... --HG-- branch : develop	9 years ago
kervala	9b8cdc2821	Changed: Use same _mm_getcsr and __cpuid intrinsics everywhere ... --HG-- branch : develop	9 years ago
kervala	68aa20257f	Changed: Use new code to determine free disk space ... --HG-- branch : develop	9 years ago
kervala	b11fabe867	Changed: Use __rdtsc() intrinsics everywhere for Intel CPUs ... --HG-- branch : develop	9 years ago
kervala	aaa9c394d7	Fixed: If mask is using colors, convert it to grayscale using Red value (compatible with previous algorithm) ... --HG-- branch : develop	9 years ago
kervala	ed98662de3	Changed: OutputPath is already "standardized" ... --HG-- branch : develop	9 years ago
kervala	fe018c959b	Changed: Use lowercase instead of uppercase for extensions ... --HG-- branch : develop	9 years ago
kervala	47bde9ccc7	Changed: Allow to resample Luminance (grayscale) bitmaps ... --HG-- branch : develop	9 years ago
kervala	c263e4dffb	Changed: Don't redefine new and delete operators if targetting x86_64 ... --HG-- branch : develop	9 years ago
kervala	6627c04a97	Changed: Copy tools related to client into client bundle under OS X ... --HG-- branch : develop	9 years ago
kervala	79e3ec61b1	Changed: Convert masks to 8 bits grayscale instead of using only Red component of RGBA bitmaps ... --HG-- branch : develop	9 years ago
kervala	494ab2ce20	Changed: Cast to CRGBA* is faster than set8888 ... --HG-- branch : develop	9 years ago
kervala	96fab4210b	Changed: Use LD_LIBRARY_PATH only when opening a document or URL ... --HG-- branch : develop	9 years ago
kervala	82acfb3bf2	Changed: Only use filename in setProcessName ... --HG-- branch : develop	9 years ago
kervala	33e701192d	Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle ... --HG-- branch : develop	9 years ago
kervala	06b83f85f7	Changed: Add an icon for crash_report under Windows ... --HG-- branch : develop	9 years ago
kervala	12c4adf943	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	de0df1645b	Changed: Don't create bundle for Ryzom client tools (we will try to package them in same bundle) ... --HG-- branch : develop	9 years ago
kervala	1a00dec5c3	Changed: Unused code ... --HG-- branch : develop	9 years ago
kervala	8087b76397	Fixed: Load 8bits textures as grayscale instead of alpha in textures_optimizer ... --HG-- branch : develop	9 years ago
kervala	844b1e3d02	Fixed: Warnings with GCC ... --HG-- branch : develop	9 years ago
kervala	b50ca03e92	Fixed: Use --args only with open ... --HG-- branch : develop	9 years ago
kervala	046c69066d	Fixed: Don't use system() under Windows, because it'll open a console window, use launchProgramAndWaitForResult instead ... --HG-- branch : develop	9 years ago
kervala	266a32ea19	Fixed: Implements launchProgramAndWaitForResult to launch a command synchronously ... --HG-- branch : develop	9 years ago
kervala	0c98a86e4b	Fixed: Display alpha as an integer ... --HG-- branch : develop	9 years ago
kervala	20711e24e3	Fixed: Typos ... --HG-- branch : develop	9 years ago
kervala	6e36d06f76	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	71f7cb28dc	Changed: Remove X11 code for OS X (we support Cocoa now) ... --HG-- branch : develop	9 years ago
kervala	8e57f2ed2e	Fixed: Dead keys under Linux (Ubuntu was using ibus input method) ... --HG-- branch : develop	9 years ago
kervala	cf8ed540a7	Changed: Use new methods in panoply_maker ... --HG-- branch : develop	9 years ago
kervala	80759eafb4	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	e995b7221f	Added: Textures optimizer tool ... --HG-- branch : develop	9 years ago
kervala	d34e3d120d	Changed: Parse nvidia-smi output to determine video memory ... --HG-- branch : develop	9 years ago
kervala	ee26c7377b	Changed: Minor change ... --HG-- branch : develop	9 years ago
kervala	437aa5b939	Changed: Added helpers methods to CBitmap ... --HG-- branch : develop	9 years ago
kervala	27a2263bd6	Changed: Added set8888() method to CGRBA ... --HG-- branch : develop	9 years ago
kervala	2ed7c0be88	Changed: Added isGray() method to CGRBA ... --HG-- branch : develop	9 years ago
kervala	8b770d41ac	Fixed: Wrong bitmap size ... --HG-- branch : develop	9 years ago
kervala	9b9ee4e492	Fixed: Install readme.txt in same directory if not using WITH_UNIX_STRUCTURE ... --HG-- branch : develop	9 years ago
kervala	91f2913026	Changed: Don't need to use std::stringstream ... --HG-- branch : develop	9 years ago
kervala	77352d5759	Changed: Minor change ... --HG-- branch : develop	9 years ago
kervala	b93414cd27	Fixed: Warning when DDS_HEADER is not initialized ... --HG-- branch : develop	9 years ago
kervala	5ccf0df1ab	Changed: Allow panoply_maker to optimize textures and masks (remove alpha channel if useless) ... --HG-- branch : develop	9 years ago
kervala	d8bc7384ae	Fixed: Don't crash if GL_VERSION returns NULL (it should never happen) ... --HG-- branch : develop	9 years ago
kervala	ba7c4ae4d4	Changed: Support for GLX_MESA_query_renderer to detect video memory ... --HG-- branch : develop	9 years ago
kervala	57859636cd	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	478a2102b8	Fixed: GCC warnings ... --HG-- branch : develop	9 years ago
kervala	ba6f66d310	Fixed: GCC warnings ... --HG-- branch : develop	9 years ago
kervala	af0eabbdea	Fixed: GCC warnings ... --HG-- branch : develop	9 years ago
kervala	83ef24dab7	Changed: Renamed screenH and screenW to _ScreenH and _ScreenW ... --HG-- branch : develop	9 years ago
kervala	d7255a63d8	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	ec86bdcf96	Changed: Force 32 bits depth with XRandr ... --HG-- branch : develop	9 years ago
kervala	cbea85c105	Changed: Implement CSystemUtils::getTotalVideoMemory() under Linux (Xorg log and lspci parsing) ... --HG-- branch : develop	9 years ago
kervala	2006f1a866	Fixed: GCC warnings ... --HG-- branch : develop	9 years ago
kervala	2d0d87a05e	Fixed: Warnings with GCC ... --HG-- branch : develop	9 years ago
kervala	4a1f4cd725	Changed: Use shared libs for X11 because API doesn't change ... --HG-- branch : develop	9 years ago
kervala	21ada78b63	Changed: Display a warning when calling getModes if Display is NULL ... --HG-- branch : develop	9 years ago
kervala	a5d3b2d461	Changed: Added new function getCommandOutput ... --HG-- branch : develop	9 years ago
kervala	4fa6247672	Changed: windows.h already included in stdligo.h ... --HG-- branch : develop	9 years ago
kervala	36358cef50	Fixed: Wrong units (1 KiB = 1024 B, 1 KB = 1000 B, etc...) ... --HG-- branch : develop	9 years ago
kervala	dd69f64225	Changed: Use a stack size of 1 MiB under all platforms for CCoTask (default under Windows) ... --HG-- branch : develop	9 years ago
kervala	55feca30d7	Changed: Use nlSleep instead of usleep ... --HG-- branch : develop	9 years ago
kervala	4061826715	Changed: Use _LP64 macro instead of sizeof(long unsigned int) == 8 ... --HG-- branch : develop	9 years ago
kervala	ffe0571a12	Changed: Use nlwarning instead of nlerror ... --HG-- branch : develop	9 years ago
kervala	360a634f5b	Changed: Don't need to use XDG_CURRENT_DESKTOP under OS X ... --HG-- branch : develop	9 years ago
kervala	5d64a01f58	Fixed: Use Xcb plugin for Qt 5 under Linux ... --HG-- branch : develop	9 years ago
kervala	09e22e292d	Changed: Use toString instead of sprintf ... --HG-- branch : develop	9 years ago
kervala	f57b1b9421	Changed: Implement CSystemUtils::getTotalVideoMemory() for Windows ... --HG-- branch : develop	9 years ago
kervala	07a1285740	Fixed: Target at least Windows 2000 ... --HG-- branch : develop	9 years ago
kervala	72af4052ee	Changed: Add getTotalVideoMemory to IDriver to query total video memory ... --HG-- branch : develop	9 years ago
Nimetu	f4d47f27aa	Fixed: Crash when div was following p element ... --HG-- branch : develop	9 years ago
Nimetu	b06d8bb039	Fixed: Stuck scrollbar ... --HG-- branch : develop	9 years ago
Nimetu	e68d6f83fe	Fixed: Incorrect vertical spacing between block style elements ... --HG-- branch : develop	9 years ago
Nimetu	5e61995c3c	Changed: Render p and div as block level elements ... --HG-- branch : develop	9 years ago
Nimetu	bcae216816	Fixed: Table colspan overwrites previous row column width ... --HG-- branch : develop	9 years ago
Nimetu	fe476d4872	Added: html TH element ... --HG-- branch : develop	9 years ago
Nimetu	2eb56b6460	Added html HR element ... --HG-- branch : develop	9 years ago
Nimetu	045a6471fe	Added: html OL list ... --HG-- branch : develop	9 years ago
kervala	ad93a9005f	Changed: Improve errors reporting ... --HG-- branch : develop	9 years ago
kervala	a22e056de1	Fixed: Typos ... --HG-- branch : develop	9 years ago
kervala	5efaa8360f	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	75eceb9b24	Fixed: loadPNG with RGB images was returning 32 ... --HG-- branch : develop	9 years ago
kervala	a550f2c760	Changed: Minor changes ... --HG-- branch : develop	9 years ago
kervala	70196d2f90	Fixed: Implement launch of executables under OS X ... --HG-- branch : develop	9 years ago
kervala	8aff509f0f	Fixed: Clang warnings ... --HG-- branch : develop	9 years ago
kervala	15aed08533	Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport) ... --HG-- branch : develop	9 years ago
kervala	9d30c279e0	Fixed: Compilation of some tools with Qt 5 in static ... --HG-- branch : develop	9 years ago
kervala	7ebe3088bb	Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set ... --HG-- branch : develop	9 years ago
kervala	fc951a24ce	Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) ... --HG-- branch : develop	9 years ago
kervala	977103f9d0	Fixed: OS X uses .dylib extension instead of .so ... --HG-- branch : develop	9 years ago
Nimetu	dceb45e373	Fixed: Keyboard capture not reset when clicking outside GUI. ... --HG-- branch : develop	9 years ago
Nimetu	612125a243	Added: Size attributes to img (width, height, max-width, max-height) ... --HG-- branch : develop	9 years ago