Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7123 commits 14 branches 1 tag 255 MiB
Commit graph

3120 commits

Author SHA1 Message Date
kervala
bd69c167d3 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-13 20:55:24 +02:00
kervala
9fd00d8505 Fixed: Missing to include PCH 
--HG--
branch : develop
 2016-05-13 20:55:00 +02:00
Nimetu
f02b388d06 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-13 13:58:33 +03:00
Nimetu
131f3814a3 Fixed: Resolve http-equiv refresh url 
--HG--
branch : develop
 2016-05-13 13:57:28 +03:00
Nimetu
5a2dc969cb Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-09 20:14:15 +03:00
Nimetu
cdfecc8d69 Fixed: url inheriting for defined empty query component 
--HG--
branch : develop
 2016-05-09 20:05:06 +03:00
kervala
9e33df4532 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-08 19:24:04 +02:00
kervala
583db43e71 Changed: Disable too verbose message for sound sheets 
--HG--
branch : develop
 2016-05-08 19:23:27 +02:00
kervala
a9685ac366 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-08 13:42:53 +02:00
kervala
1e0283d38c Fixed: Use %p to display pointer 
--HG--
branch : develop
 2016-05-08 13:22:32 +02:00
Nimetu
f7f275671f Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-05 15:01:10 +03:00
Nimetu
6f8a9b8108 Changed: Increase default request timeout for web browsers 
--HG--
branch : develop
 2016-05-05 15:00:28 +03:00
Nimetu
edd16d9a82 Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-23 18:49:52 +03:00
Nimetu
a1e8408be0 Fixed: Tooltip position related to parent window 
--HG--
branch : develop
 2016-04-23 18:49:36 +03:00
kervala
51e4d2a53c Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-15 16:12:32 +02:00
kervala
ccb69f8b27 Changed: Signed/unsigned comparison 
--HG--
branch : develop
 2016-04-15 16:11:37 +02:00
kervala
d1d6f6da41 Fixed: Creation of sn_0_* folders under OS X 10.7 
--HG--
branch : develop
 2016-04-15 16:11:14 +02:00
kervala
7d9ff0ad72 Backed out changeset: 44cd3beacab6 
--HG--
branch : compatibility-develop
 2016-04-14 18:56:48 +02:00
kervala
c0f51c1c5b Changed: Temporary checks for a OS X 10.7 bug... 
--HG--
branch : compatibility-develop
 2016-04-14 18:19:19 +02:00
kervala
346a0297f6 Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-12 15:43:47 +02:00
kervala
7ff21f975d Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6 
--HG--
branch : develop
 2016-04-12 15:43:13 +02:00
kervala
2d8407157b Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-06 09:34:34 +02:00
kervala
a002b20c7f Changed: Minor changes 
--HG--
branch : develop
 2016-04-06 09:29:37 +02:00
kervala
e42d3a3f74 Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-02 13:32:28 +02:00
kervala
3219ce959b Changed: Use booleans to know if we already added a loopback address 
--HG--
branch : develop
 2016-04-02 13:31:59 +02:00
kervala
3c8228df15 Fixed: Empty const char* because std::string destructor called 
--HG--
branch : develop
 2016-04-02 13:31:04 +02:00
kervala
7dd635960a Changed: Use toString for formatting 
--HG--
branch : develop
 2016-04-02 13:30:08 +02:00
kervala
c30bf20ccc Changed: Minor changes 
--HG--
branch : develop
 2016-04-02 13:29:42 +02:00
kervala
a410f2fcc1 Changed: Better camel case syntax 
--HG--
branch : develop
 2016-04-02 13:28:42 +02:00
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
kervala
05ca6f74c6 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-20 17:28:00 +01:00
kervala
89532b2afb Fixed: Compilation (missing NLMISC namespaces for nlfopen) 
--HG--
branch : develop
 2016-03-20 17:27:25 +01:00
kaetemi
f767e7a488 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-19 22:34:32 +01:00
kaetemi
bbec2c5b33 Fix random thunder activation caused by rounding error in setup interpolation 
--HG--
branch : develop
 2016-03-19 22:13:38 +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
1eddef3c93 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-18 22:27:43 +01:00
kervala
f376317f10 Fixed: Compilation 
--HG--
branch : develop
 2016-03-18 22:26:43 +01:00
kervala
410b9bcf55 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-18 22:16:28 +01:00
kervala
40c7c82a2d Changed: Removed wrong check 
--HG--
branch : develop
 2016-03-18 22:09:43 +01:00
kervala
05e0500aaf Changed: Check if LC_NUMERIC is correct before loading or saving config files 
--HG--
branch : develop
 2016-03-18 22:09:26 +01:00
kervala
97647b2264 Fixed: Set numeric locale in CApplicationContext 
--HG--
branch : develop
 2016-03-18 22:08:43 +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
962b43d2bd Fixed: Possible crashes if ov_info returns NULL 
--HG--
branch : develop
 2016-03-18 15:09:02 +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
kervala
114543ba07 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-16 19:15:11 +01:00
kervala
c39190b38d Changed: Use same algorithm as before Windows unicodes fixes (try to open the file instead of checking its attributes) 
--HG--
branch : develop
 2016-03-16 19:12:34 +01:00
kervala
b0d50dea69 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-15 12:37:11 +01:00
kervala
f1b882c0f3 Changed: Removed useless dependencies on DirectX 
--HG--
branch : develop
 2016-03-15 12:36:21 +01:00
kaetemi
b9d366372e Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-10 12:09:18 +01:00
kervala
5c3f5e841c Changed: Write a warning instead of error 
--HG--
branch : develop
 2016-03-09 11:24:17 +01:00
kervala
faae2973ac Fixed: With new iOS versions (and perhaps OS X), locale can contains country code 
--HG--
branch : develop
 2016-03-09 11:24:01 +01:00
kervala
41176a7d02 Fixed: OpenGL ES driver compilation 
--HG--
branch : develop
 2016-03-09 11:22:09 +01:00
kaetemi
0c2ff923b7 Merge with develop 
--HG--
branch : compatibility-develop
 2016-03-08 12:46:47 +01:00
kaetemi
48a120b21f Fix curl crash 
--HG--
branch : develop
 2016-03-08 12:46:15 +01:00
kervala
0db2ed85ca Changed: Temporarily disable Spanish and Russian translations (not yet ready) 
--HG--
branch : compatibility-develop
 2016-03-05 12:45: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
26722fb579 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-28 16:46:11 +01:00
kervala
d39911345e Fixed: Only use "open" if extension is app 
--HG--
branch : develop
 2016-02-28 16:44:08 +01:00
kervala
12f3abbaaf Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-28 12:46:34 +01:00
kervala
0040fa888e Fixed: Compilation under OS X 
--HG--
branch : develop
 2016-02-28 12:45:31 +01:00
kervala
62104e31b1 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-27 19:22:53 +01:00
kervala
a47d3845bd Fixed: Compilation 
--HG--
branch : develop
 2016-02-27 19:22:23 +01: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
kervala
e23f32e902 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-23 17:05:57 +01:00
kervala
ad4857cfaa Changed: Minor changes 
--HG--
branch : develop
 2016-02-23 16:57:34 +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
Nimetu
a50689a885 Changed: Use multiline text for http errors 
--HG--
branch : develop
 2016-03-01 22:30:05 +02:00
kervala
c54cdb7543 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-21 20:30:16 +01:00
kervala
dd15287d6c Changed: Use a wchar_t buffer for registry 
--HG--
branch : develop
 2016-02-21 20:29:14 +01:00
kervala
5284bd37f1 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-21 13:22:22 +01:00
kervala
f698c31aa1 Changed: Allow to compile WITH_NEL_TESTS without compiling tools 
--HG--
branch : develop
 2016-02-21 13:20:49 +01:00
kervala
3e14025cf8 Changed: Include wang_hash.h in NLMISC files 
--HG--
branch : develop
 2016-02-21 13:19:41 +01:00
kervala
3161ec2a77 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-20 19:29:00 +01:00
kervala
0575a51632 Last changes for Unicode support under Windows, fixes #261 
--HG--
branch : develop
 2016-02-20 19:21:39 +01:00
kervala
2b7ce14a57 Changed: Minor changes 
--HG--
branch : develop
 2016-02-20 19:20:49 +01:00
kervala
591c7ed0bf Fixed: Display an error if unable to open a ogg file 
--HG--
branch : develop
 2016-02-20 19:01:31 +01:00
kervala
33a30d186c Use Unicode of CreateProcess, issue #261 
--HG--
branch : develop
 2016-02-20 18:54:32 +01:00
kervala
e68d6e3617 Changed: Minor changes 
--HG--
branch : develop
 2016-02-20 18:53:39 +01:00
kervala
ba077aaab8 Use right versions of Win32 functions, issue #261 
--HG--
branch : develop
 2016-02-20 18:52:57 +01:00
kervala
4d48beeaa4 Use ANSI versions of Win32 functions when not using Unicode text, issue #261 
--HG--
branch : develop
 2016-02-20 18:38:17 +01:00
kervala
ac51d16583 Use Unicode versions of Win32 functions, issue #261 
--HG--
branch : develop
 2016-02-20 18:30:51 +01:00
kervala
f644805ff7 Replace ifstream and ofstream to manage UTF-8 filenames, issue #261 
--HG--
branch : develop
 2016-02-20 18:15:04 +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
6d21e22905 Use CIFile to load font instead of internal Freetype functions, issue #261 
--HG--
branch : develop
 2016-02-20 18:01:57 +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
871093d4ce Merge 
--HG--
branch : develop
 2016-02-18 11:58:56 +01:00
kaetemi
e28b6deaf9 Fix gl context not being deleted with custom window 
--HG--
branch : develop
 2016-02-18 11:56:44 +01:00
kaetemi
30077f3977 Move some stuff for easier debug 
--HG--
branch : develop
 2016-02-18 11:55:58 +01:00
Gary Preston
7281c40577 Update indentation of tiles_model::data to match coding standard use of tabs. 
--HG--
branch : develop
 2016-02-17 14:07:19 +00:00
Gary Preston
48e86eedee Fix qt4 build error. 
--HG--
branch : develop
 2016-02-17 14:03:57 +00: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
9a7dee4445 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-15 12:11:08 +01:00
kervala
2330fc26ec Fixed: Warning (wrong size) 
--HG--
branch : develop
 2016-02-15 11:54:28 +01:00
kervala
cb46be8051 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-14 19:59:16 +01:00
kervala
fdd5f69e2d Fixed: Windows XP doesn't support inet_pton and inet_ntop 
--HG--
branch : develop
 2016-02-14 19:58:42 +01:00
kervala
37424fdef4 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-14 19:16:53 +01:00
kervala
767d91ce6d Fixed: Set _WIN32_WINNT used by WinSock for IPv6 
--HG--
branch : develop
 2016-02-14 19:16:22 +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
Nimetu
b7f809c6a7 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-14 01:24:10 +02:00
Nimetu
6d9c9600a2 Fixed: reloading cached image with style reload:1 hint 
--HG--
branch : develop
 2016-02-14 01:22:44 +02:00
kervala
b873aae389 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-13 23:43:04 +01:00
kervala
e2271f8db3 Fixed: All files and directories names are using 8-bits locale at the moment, so don't mix with UTF-8 under Windows (we could improve that later but it'll need a lot of changes, especially for all fopen calls) 
--HG--
branch : develop
 2016-02-13 23:33:27 +01:00
kervala
e70a169955 Changed: Display a warning when a environment variable doesn't exist 
--HG--
branch : develop
 2016-02-13 23:30:18 +01:00
kervala
fc69d4cec9 Changed: Use same code as under Linux for OS X when executing sheel scripts 
--HG--
branch : develop
 2016-02-13 23:30:00 +01:00
kervala
a4d98fb13b Changed: Remember startup path (the initial current directory) 
--HG--
branch : develop
 2016-02-13 23:29:00 +01:00
kervala
e7e8832130 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-13 14:00:02 +01:00
kervala
9913ec7e72 Fixed: Don't try to convert next meshes if an error occurs 
--HG--
branch : develop
 2016-02-13 13:58:21 +01:00
kervala
c9740a9e61 Fixed: Return true when "open" succeeds under OS X 
--HG--
branch : develop
 2016-02-13 13:57:43 +01:00
kervala
4c31865b0e Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-12 16:05:43 +01:00
kervala
7ed708eae8 Fixed: Display an error if unable to find database.cfg 
--HG--
branch : develop
 2016-02-12 16:04:55 +01:00
kervala
34282be5af Changed: Reuse NLMISC::formatErrorMessage instead of native FormatMessage 
--HG--
branch : develop
 2016-02-12 16:04:18 +01:00
kervala
8008b68877 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-11 21:01:27 +01:00
kervala
53a16257f1 Fixed: CPath::makePathAbsolute removing first / 
--HG--
branch : develop
 2016-02-11 21:00:54 +01:00
kervala
19dbdf4fad Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-10 18:48:09 +01:00
kervala
df70c9a9f9 Changed: Minor changes 
--HG--
branch : develop
 2016-02-10 18:47:35 +01:00
kervala
ed78c7153c Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-05 12:30:26 +01:00
kervala
fd1344a12e Fixed: NeL unit test with GCC 
--HG--
branch : develop
 2016-02-05 12:29:42 +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
kaetemi
8ea6f521d3 Fix for VS2008 build 
--HG--
branch : develop
 2016-02-04 12:07:36 +01:00
kervala
fa4fb1992d Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-03 21:58:58 +01:00
kervala
6a7c33fa32 Changed: Updated launchProgramAndWaitForResult to support .bat files 
--HG--
branch : develop
 2016-02-03 21:58:29 +01:00
kervala
487aca0979 Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-02 19:51:11 +01:00
kervala
923434aa72 Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess 
--HG--
branch : develop
 2016-02-02 19:49:37 +01:00
kervala
0e0dbf688d Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-02 19:31:12 +01:00
kervala
9b52f6bc28 Changed: Use "open" to open other programs too under OS X 
--HG--
branch : develop
 2016-02-02 19:20:34 +01:00
kervala
d8ddb1fd11 Fixed: Async execution of .bat under Windows 
--HG--
branch : develop
 2016-02-02 19:20:02 +01:00
kervala
6459d901ef Merge with develop 
--HG--
branch : compatibility-develop
 2016-02-02 12:37:59 +01:00
kervala
e5a601c109 Changed: Unit tests for bytesToHumanReadableUnits 
--HG--
branch : develop
 2016-02-02 12:37:20 +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
b692b78718 Fixed: Tests for fromStringwith a boolean 
--HG--
branch : develop
 2016-02-02 11:38:08 +01:00
kervala
285965fe76 Added: New unit tests for common.h 
--HG--
branch : develop
 2016-02-02 11:37:46 +01:00
kervala
20c7c342ca Fixed: Don't display logs in console for unit tests 
--HG--
branch : develop
 2016-02-02 11:34:16 +01:00
kervala
7b1ab1592e Fixed: Support new ISO units (KiB, MiB, etc...) in humanReadableToBytes 
--HG--
branch : develop
 2016-02-02 11:33:44 +01:00