kervala
53f2292613
Merge with develop
...
--HG--
branch : compatibility-develop
2016-04-02 11:34:39 +02:00
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
2016-03-29 02:29:35 +02:00
kaetemi
f767e7a488
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-19 22:34:32 +01:00
kaetemi
198323b9b5
Compile fix
...
--HG--
branch : develop
2016-03-19 22:13:38 +01:00
kervala
6b2e47e59e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-19 19:30:06 +01:00
kervala
89be3e39de
Fixed: Clang warnings
...
--HG--
branch : develop
2016-03-19 19:29:03 +01:00
kervala
833976be5b
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-19 16:21:46 +01:00
kervala
0d773e3e79
Fixed: Use nlfopen in tools and servers
...
--HG--
branch : develop
2016-03-19 16:21:06 +01:00
kervala
410b9bcf55
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-18 22:16:28 +01:00
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
2016-03-18 22:07:52 +01:00
kervala
94f4e901c9
Changed: Fix clang warnings
...
--HG--
branch : develop
2016-03-18 22:06:20 +01:00
kervala
a77fee685b
Changed: Implement CI18N::setSystemLanguageCode, if we must force it
...
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)
--HG--
branch : develop
2016-03-18 15:07:49 +01:00
Nimetu
261d9c789b
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-03 00:00:30 +02:00
Nimetu
1d0d1a505c
Added: Possibility to set text as grayed in combo box
...
--HG--
branch : develop
2016-03-02 23:58:48 +02:00
Nimetu
5c7eeb6d32
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-01 22:39:10 +02:00
kervala
f481a12799
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-27 18:39:41 +01:00
kervala
6104011d11
Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape)
...
--HG--
branch : develop
2016-02-27 18:38:58 +01:00
kervala
b3b48a3ae3
Changed: New functions to convert arguments string from/to an array of strings
...
--HG--
branch : develop
2016-02-27 18:37:43 +01:00
Nimetu
a95c887534
Changed: Implement multi-row select box
...
--HG--
branch : develop
2016-02-23 10:52:21 +02:00
Nimetu
e2fca3a8f3
Added: http-equiv refresh
...
--HG--
branch : develop
2016-02-23 10:52:24 +02:00
kervala
3161ec2a77
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-20 19:29:00 +01:00
kervala
69547db6ce
New function to format a timestamp to human readable
...
--HG--
branch : develop
2016-02-20 18:10:17 +01:00
kervala
9370e93dd6
Removed useless comments/commented code
...
--HG--
branch : develop
2016-02-20 18:09:24 +01:00
kervala
aaecf96b67
Use new wrapper insteaf of fopen, issue #261
...
--HG--
branch : develop
2016-02-20 17:56:25 +01:00
kervala
e69090c457
Create fopen wrapper that internally uses wide characters under Windows, issue #261
...
--HG--
branch : develop
2016-02-20 17:46:11 +01:00
kaetemi
30077f3977
Move some stuff for easier debug
...
--HG--
branch : develop
2016-02-18 11:55:58 +01:00
Gary Preston
b4a7ab66ab
Add vector include and remove extra qualification on s_InitFlags.
...
--HG--
branch : develop
2016-02-16 19:01:14 +00:00
kaetemi
1fbc179bc3
Centralized project directory configuration mechanism
...
--HG--
branch : feature-material-editor
2016-02-16 02:28:03 +01:00
kaetemi
874ac2c921
Move pipeline utilities into new pipeline library
...
--HG--
branch : feature-material-editor
2016-02-16 00:28:24 +01:00
kervala
8327d22117
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-14 18:21:41 +01:00
kervala
edf4331d1a
Fixed: Implements IPv6 in CInetAddress
...
--HG--
branch : develop
2016-02-14 18:21:09 +01:00
kervala
b873aae389
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-13 23:43:04 +01:00
kervala
a4d98fb13b
Changed: Remember startup path (the initial current directory)
...
--HG--
branch : develop
2016-02-13 23:29:00 +01:00
kervala
ddff1b4e5e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-04 14:33:30 +01:00
kaetemi
9602fcc8f0
Also support AppData/Local to allow a non-roaming config
...
--HG--
branch : develop
2016-02-04 13:02:32 +01:00
kervala
6459d901ef
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-02 12:37:59 +01:00
kervala
092a3226bd
Changed: New function bytesToHumanReadableUnits to use specific strings for units
...
--HG--
branch : develop
2016-02-02 12:37:06 +01:00
kervala
0919fc66e4
Changed: Support more values for fromString with a boolean
...
--HG--
branch : develop
2016-02-02 11:32:20 +01:00
kervala
325242c2e4
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
89319eb99c
Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...)
...
--HG--
branch : develop
2016-01-26 22:41:58 +01:00
kervala
af2f38612a
Fixed: Remove inherited dependency on libxml2 for all projects
...
--HG--
branch : develop
2016-01-26 22:30:13 +01:00
kervala
9aea637643
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-23 10:19:01 +01:00
kervala
19aa093ea8
Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs
...
--HG--
branch : develop
2016-01-23 10:18:09 +01:00
kervala
93e1289a77
Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..)
...
--HG--
branch : develop
2016-01-23 09:44:41 +01:00
kervala
5a6580dc38
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-21 10:08:56 +01:00
kervala
aff9cccd0c
Changed: Improve toString(const bool &val)...
...
--HG--
branch : develop
2016-01-21 10:06:35 +01:00
Nimetu
6b13fdd770
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-20 19:15:45 +02:00
Nimetu
52dcf1a300
Changed: Use url from <base> element for relative urls
...
--HG--
branch : develop
2016-01-20 19:15:20 +02:00
kervala
f50c9c0866
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-19 20:42:11 +01:00
kervala
fa22852adb
Changed: Removed fromString(const char *, ...) because useless
...
--HG--
branch : develop
2016-01-19 20:41:41 +01:00
kervala
d54e569b3f
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-18 21:32:01 +01:00
kervala
b91e3bdf0e
Changed: Improved CCmdArgs
...
--HG--
branch : develop
2016-01-18 21:22:57 +01:00
kervala
cc282fd3d5
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-16 23:50:23 +01:00
kervala
b3cfd5f6bb
Fixed: Use lua_tointeger under Lua 5.2 and prior versions
...
--HG--
branch : develop
2016-01-16 21:35:34 +01:00
kervala
cca0dd450e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-16 10:52:18 +01:00
kaetemi
8cfaa89620
Separate window displayer message stringify
...
--HG--
branch : develop
2016-01-15 17:10:39 +01:00
kaetemi
9a0c6290a2
Fix another VS2015 warning
...
--HG--
branch : develop
2016-01-15 12:07:33 +01:00
kaetemi
9a477d976b
VS2015 compilation fixes
...
--HG--
branch : develop
2016-01-15 11:34:23 +01:00
kervala
f820e7b703
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-14 21:28:47 +01:00
kervala
b7fe07d781
Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257
...
--HG--
branch : develop
2016-01-14 21:26:10 +01:00
kervala
3c4f324bfe
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-13 20:05:06 +01:00
kervala
bd5f838d6d
Changed: Minor changes
...
--HG--
branch : develop
2016-01-13 19:54:23 +01:00
kervala
e1c14db5a0
Fixed: getLastSeparator should return std::string::size_type instead of an integer
...
--HG--
branch : develop
2016-01-13 19:47:35 +01:00
kervala
a66fa8cc9c
Changed: Implement CPath::isAbsolutePath
...
--HG--
branch : develop
2016-01-13 19:46:27 +01:00
kervala
af9610328f
Changed: Implement expandEnvironmentVariables function
...
--HG--
branch : develop
2016-01-13 19:45:02 +01:00
kervala
ad36e59a71
Fixed: Save filenames in .bank with / instead of system separator
...
--HG--
branch : develop
2016-01-13 19:43:46 +01:00
kervala
df816b2a5d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-12 22:32:22 +01:00
kervala
49ef5a1ed7
Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0
...
--HG--
branch : develop
2016-01-12 22:21:38 +01:00
kervala
3f4a5010f6
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-07 17:41:02 +01:00
kervala
9e8cd07e4b
Changed: HAVE_X86_64 is defined or not
...
--HG--
branch : develop
2016-01-07 17:39:53 +01:00
kervala
b3a392d559
Changed: Minor changes
...
--HG--
branch : develop
2016-01-07 17:36:17 +01:00
kervala
ddba3e583c
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 13:22:47 +01:00
kervala
6efce5ba59
Changed: Support for new key events
...
--HG--
branch : develop
2016-01-06 12:42:10 +01:00
kervala
76744b18c7
Changed: Minor change
...
--HG--
branch : develop
2016-01-06 12:39:58 +01:00
Nimetu
410ddea49d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-06 01:02:22 +02:00
Nimetu
8475f25e75
Changed: Refactor DL
...
--HG--
branch : develop
2016-01-06 00:11:17 +02:00
Nimetu
298a659c6f
Changed: Merge UL and OL code
...
--HG--
branch : develop
2016-01-05 20:21:40 +02:00
kervala
e91c529a98
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-04 19:27:21 +01:00
kervala
0dc70105d5
Fixed: __rdtsc() under old versions of GCC
...
--HG--
branch : develop
2016-01-04 19:26:25 +01:00
kervala
ae752f72d8
Changed: Define CLANG_VERSION is using clang compiler
...
--HG--
branch : develop
2016-01-04 19:18:19 +01:00
kervala
91c559d48a
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-04 15:41:29 +01:00
kervala
68aa20257f
Changed: Use new code to determine free disk space
...
--HG--
branch : develop
2016-01-04 15:39:31 +01:00
kervala
b11fabe867
Changed: Use __rdtsc() intrinsics everywhere for Intel CPUs
...
--HG--
branch : develop
2016-01-04 15:35:02 +01:00
kervala
b78afa1c4d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-04 14:03:11 +01:00
kervala
47bde9ccc7
Changed: Allow to resample Luminance (grayscale) bitmaps
...
--HG--
branch : develop
2016-01-04 13:54:59 +01:00
kervala
c263e4dffb
Changed: Don't redefine new and delete operators if targetting x86_64
...
--HG--
branch : develop
2016-01-04 13:48:57 +01:00
kervala
47364c47c3
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-02 20:29:55 +01:00
kervala
266a32ea19
Fixed: Implements launchProgramAndWaitForResult to launch a command synchronously
...
--HG--
branch : develop
2016-01-02 19:14:13 +01:00
kervala
bcfdd36844
Merge with develop
...
--HG--
branch : compatibility-develop
2016-01-01 16:27:45 +01:00
kervala
437aa5b939
Changed: Added helpers methods to CBitmap
...
--HG--
branch : develop
2016-01-01 16:02:54 +01:00
kervala
27a2263bd6
Changed: Added set8888() method to CGRBA
...
--HG--
branch : develop
2016-01-01 16:01:03 +01:00
kervala
2ed7c0be88
Changed: Added isGray() method to CGRBA
...
--HG--
branch : develop
2016-01-01 16:00:17 +01:00
kervala
6710268d0a
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-28 16:44:35 +01:00
kervala
77352d5759
Changed: Minor change
...
--HG--
branch : develop
2015-12-28 16:43:20 +01:00
kervala
4806693f49
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-26 14:38:37 +01:00
kervala
af0eabbdea
Fixed: GCC warnings
...
--HG--
branch : develop
2015-12-26 14:09:15 +01:00
kervala
83ef24dab7
Changed: Renamed screenH and screenW to _ScreenH and _ScreenW
...
--HG--
branch : develop
2015-12-26 14:02:01 +01:00
kervala
d7255a63d8
Changed: Minor changes
...
--HG--
branch : develop
2015-12-26 14:00:39 +01:00
kervala
9b5c426c19
Merged with develop
...
--HG--
branch : compatibility-develop
2015-12-25 20:52:18 +01:00
kervala
2d0d87a05e
Fixed: Warnings with GCC
...
--HG--
branch : develop
2015-12-25 20:49:59 +01:00
kervala
86a903c96e
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-25 15:37:07 +01:00
kervala
a5d3b2d461
Changed: Added new function getCommandOutput
...
--HG--
branch : develop
2015-12-25 15:29:23 +01:00
kervala
59c0cf7f00
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-23 15:31:37 +01:00
kervala
dd69f64225
Changed: Use a stack size of 1 MiB under all platforms for CCoTask (default under Windows)
...
--HG--
branch : develop
2015-12-23 15:10:06 +01:00
kervala
55feca30d7
Changed: Use nlSleep instead of usleep
...
--HG--
branch : develop
2015-12-23 15:08:08 +01:00
kervala
4061826715
Changed: Use _LP64 macro instead of sizeof(long unsigned int) == 8
...
--HG--
branch : develop
2015-12-23 15:04:22 +01:00
kervala
f57b1b9421
Changed: Implement CSystemUtils::getTotalVideoMemory() for Windows
...
--HG--
branch : develop
2015-12-23 14:48:33 +01:00
kervala
07a1285740
Fixed: Target at least Windows 2000
...
--HG--
branch : develop
2015-12-23 14:47:11 +01:00
kervala
72af4052ee
Changed: Add getTotalVideoMemory to IDriver to query total video memory
...
--HG--
branch : develop
2015-12-23 14:36:16 +01:00
Nimetu
67eee7f3dd
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-19 20:40:05 +02:00
Nimetu
5e61995c3c
Changed: Render p and div as block level elements
...
--HG--
branch : develop
2015-12-19 20:39:40 +02:00
Nimetu
193abf876b
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-18 14:34:48 +02:00
Nimetu
045a6471fe
Added: html OL list
...
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
kervala
74f297f588
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-13 15:26:37 +01:00
kervala
8aff509f0f
Fixed: Clang warnings
...
--HG--
branch : develop
2015-12-13 15:25:28 +01:00
kervala
15aed08533
Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport)
...
--HG--
branch : develop
2015-12-13 14:21:20 +01:00
kervala
fc951a24ce
Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*)
...
--HG--
branch : develop
2015-12-13 13:03:16 +01:00
kervala
6f031728f5
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-11 20:21:56 +01:00
kervala
977103f9d0
Fixed: OS X uses .dylib extension instead of .so
...
--HG--
branch : develop
2015-12-11 20:19:10 +01:00
Nimetu
5fc50473f7
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-08 21:54:21 +02:00
Nimetu
612125a243
Added: Size attributes to img (width, height, max-width, max-height)
...
--HG--
branch : develop
2015-12-08 21:53:54 +02:00
kervala
b46dfe178f
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-08 14:33:49 +01:00
kervala
76a8904e9a
Fixed: Compilation under OS X
...
--HG--
branch : develop
2015-12-08 14:33:09 +01:00
Nimetu
f37758b330
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-06 16:38:52 +02:00
Nimetu
8f87990a1b
Added: Smooth scrolling
...
--HG--
branch : develop
2015-12-06 16:38:29 +02:00
Nimetu
cb94cb4f9f
Fixed: Scrolling in small steps not working.
...
--HG--
branch : develop
2015-12-06 16:26:39 +02:00
Nimetu
152200decc
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-03 18:33:27 +02:00
Nimetu
7cbd840ce1
Added: style for html elements del, u, em, strong, small, and dl list
...
--HG--
branch : develop
2015-12-03 15:50:54 +02:00
Nimetu
d380ce2522
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-02 20:38:11 +02:00
kervala
6d1346d0cb
Merge with develop
...
--HG--
branch : compatibility-develop
2015-12-02 19:28:44 +01:00
kervala
d4dd2b7264
Fixed: Getters for Anisotropic Filtering
...
--HG--
branch : develop
2015-12-02 18:56:49 +01:00
kervala
1009cc933b
Merge with develop
...
--HG--
branch : compatibility-develop
2015-11-30 12:26:23 +01:00
kervala
2e58a0725a
Changed: Forgot other ##
...
--HG--
branch : develop
2015-11-30 12:25:43 +01:00
kervala
e87442e582
Merge with develop
...
--HG--
branch : compatibility-develop
2015-11-30 10:30:14 +01:00
kervala
94f035ed8f
Fixed: GCC doesn't support no arguments for __VA_ARGS__
...
--HG--
branch : develop
2015-11-30 10:29:24 +01:00
kervala
74196261ee
Fixed: VC++ 2010 already supports ULL
...
--HG--
branch : develop
2015-11-30 10:28:06 +01:00
kervala
0623258189
Fixed: 64 bits constants truncated in 32 bits
...
--HG--
branch : develop
2015-11-30 10:27:41 +01:00
Nimetu
d4ed66d99b
Added: URL #fragment navigation.
...
--HG--
branch : develop
2015-11-26 11:29:50 +02:00
Nimetu
f4599e183b
Added: Common attributes to h1..h6 elements
...
--HG--
branch : develop
2015-12-02 20:37:44 +02:00
kervala
369a9efe0d
Changed: Temporary disable NL_USES_DEFAULT_ARENA_OBJECT_ALLOCATOR for ITexture
...
--HG--
branch : compatibility-develop
2015-11-26 10:23:27 +01:00
kaetemi
6c2490090d
Merge with feature-export-assimp
...
--HG--
branch : develop
2015-11-16 00:46:27 +01:00
kervala
9e88fa645b
Changed: Support for integer types in Lua 5.3, fixes #253
...
--HG--
branch : develop
2015-11-14 18:19:58 +01:00
kervala
53f46eb5fa
Changed: Support for integer types in Lua 5.3, fixes #253
...
--HG--
branch : develop
2015-11-14 11:46:17 +01:00
kervala
aa3d209d39
Fixed: Crash in CLuaManager
...
--HG--
branch : develop
2015-11-13 19:18:41 +01:00
kervala
a8d81c689b
Changed: Support for integer types in Lua 5.3, fixes #253
...
--HG--
branch : develop
2015-11-13 18:42:50 +01:00
Nimetu
76ee797e49
Add lua function CCtrlBase::setTooltipUtf8 to set tooltip from html page
...
--HG--
branch : develop
2015-11-12 20:15:04 +02:00
kervala
3ac728872e
Fixed: Typos (renamed restaure to restore)
...
--HG--
branch : develop
2015-11-08 11:53:46 +01:00
Nimetu
8a55f1b1e9
Changed: Allow to set max concurrent cURL connections per CGroupHTML instance
...
--HG--
branch : develop
2015-11-08 01:51:34 +02:00
kervala
9b231afa54
Fixed: Get system language code under OS X too and added method in NLMISC::CI18N
...
--HG--
branch : develop
2015-11-07 14:52:46 +01:00
kervala
93a03b5db0
Fixed: clang warnings
...
--HG--
branch : develop
2015-11-06 15:24:19 +01:00