Dremor
159898b081
Merge branch 'ryzomcore' into 'develop'
...
Merge Ryzomcore into Develop
See merge request !2
2016-05-02 08:01:47 +00:00
Nimetu
6b75bdb0e1
Fixed: Tooltip position related to parent window
2016-04-23 18:49:36 +03:00
kervala
b0934cabe4
Changed: Signed/unsigned comparison
2016-04-15 16:11:37 +02:00
kervala
c1983fba05
Fixed: Creation of sn_0_* folders under OS X 10.7
2016-04-15 16:11:14 +02:00
kervala
3d50a01f83
Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6
2016-04-12 15:43:13 +02:00
kervala
f93dfcfefe
Changed: Minor changes
2016-04-06 09:29:37 +02:00
kervala
4cccd74b25
Changed: Use booleans to know if we already added a loopback address
2016-04-02 13:31:59 +02:00
kervala
62a7ed13fe
Fixed: Empty const char* because std::string destructor called
2016-04-02 13:31:04 +02:00
kervala
4e62ef6921
Changed: Use toString for formatting
2016-04-02 13:30:08 +02:00
kervala
e2073f31d7
Changed: Minor changes
2016-04-02 13:29:42 +02:00
kervala
a445afef3c
Changed: Better camel case syntax
2016-04-02 13:28:42 +02:00
depyraken
d3c21bdd08
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]
2016-03-29 02:29:35 +02:00
kervala
9aae3598aa
Merge with develop
2016-03-20 17:28:00 +01:00
kervala
e6729fb0e5
Fixed: Compilation (missing NLMISC namespaces for nlfopen)
2016-03-20 17:27:25 +01:00
kaetemi
354e52aac1
Merge with develop
2016-03-19 22:34:32 +01:00
kaetemi
c83f467be1
Fix random thunder activation caused by rounding error in setup interpolation
2016-03-19 22:13:38 +01:00
kaetemi
d76dc8fe56
Compile fix
2016-03-19 22:13:38 +01:00
kervala
54ceef6c99
Merge with develop
2016-03-19 19:30:06 +01:00
kervala
17b390e589
Fixed: Clang warnings
2016-03-19 19:29:03 +01:00
kervala
93f5836fd5
Merge with develop
2016-03-19 16:21:46 +01:00
kervala
82985016cf
Fixed: Use nlfopen in tools and servers
2016-03-19 16:21:06 +01:00
kervala
894ee5a47b
Merge with develop
2016-03-18 22:27:43 +01:00
kervala
5caef15f94
Fixed: Compilation
2016-03-18 22:26:43 +01:00
kervala
29c946b73a
Merge with develop
2016-03-18 22:16:28 +01:00
kervala
bde61427a5
Changed: Removed wrong check
2016-03-18 22:09:43 +01:00
kervala
03715a64e0
Changed: Check if LC_NUMERIC is correct before loading or saving config files
2016-03-18 22:09:26 +01:00
kervala
b342f11949
Fixed: Set numeric locale in CApplicationContext
2016-03-18 22:08:43 +01:00
kervala
97979c9083
Changed: Don't need to use Windows functions with locale because the bug also occurs under Linux and OS X
2016-03-18 22:07:52 +01:00
kervala
baa490ca9c
Changed: Fix clang warnings
2016-03-18 22:06:20 +01:00
kervala
b4de9e66f5
Fixed: Possible crashes if ov_info returns NULL
2016-03-18 15:09:02 +01:00
kervala
d72a59f5ea
Changed: Implement CI18N::setSystemLanguageCode, if we must force it
...
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)
2016-03-18 15:07:49 +01:00
kervala
1b724c56fc
Merge with develop
2016-03-16 19:15:11 +01:00
kervala
b86637ad56
Changed: Use same algorithm as before Windows unicodes fixes (try to open the file instead of checking its attributes)
2016-03-16 19:12:34 +01:00
kervala
a4be9e2479
Merge with develop
2016-03-15 12:37:11 +01:00
kervala
87bfd29c5f
Changed: Removed useless dependencies on DirectX
2016-03-15 12:36:21 +01:00
kaetemi
4a581d89fa
Merge with develop
2016-03-10 12:09:18 +01:00
kervala
97f6cfe760
Changed: Write a warning instead of error
2016-03-09 11:24:17 +01:00
kervala
3300934591
Fixed: With new iOS versions (and perhaps OS X), locale can contains country code
2016-03-09 11:24:01 +01:00
kervala
2221bae1b2
Fixed: OpenGL ES driver compilation
2016-03-09 11:22:09 +01:00
kaetemi
130901402d
Merge with develop
2016-03-08 12:46:47 +01:00
kaetemi
7a5a8093c4
Fix curl crash
2016-03-08 12:46:15 +01:00
kervala
8ae3b52846
Changed: Temporarily disable Spanish and Russian translations (not yet ready)
2016-03-05 12:45:49 +01:00
Nimetu
415eae4388
Merge with develop
2016-03-03 00:00:30 +02:00
Nimetu
14f1fa63fe
Added: Possibility to set text as grayed in combo box
2016-03-02 23:58:48 +02:00
Nimetu
beadf6657b
Merge with develop
2016-03-01 22:39:10 +02:00
kervala
9e0918ad09
Merge with develop
2016-02-28 16:46:11 +01:00
kervala
589e320266
Fixed: Only use "open" if extension is app
2016-02-28 16:44:08 +01:00
kervala
cad46d0e2c
Merge with develop
2016-02-28 12:46:34 +01:00
kervala
b96d2f17c5
Fixed: Compilation under OS X
2016-02-28 12:45:31 +01:00
kervala
6c9db77a89
Merge with develop
2016-02-27 19:22:53 +01:00
kervala
11447db573
Fixed: Compilation
2016-02-27 19:22:23 +01:00
kervala
4be2a5c844
Merge with develop
2016-02-27 18:39:41 +01:00
kervala
1704030c38
Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape)
2016-02-27 18:38:58 +01:00
kervala
bc2c147722
Changed: New functions to convert arguments string from/to an array of strings
2016-02-27 18:37:43 +01:00
kervala
4a8741a9b0
Merge with develop
2016-02-23 17:05:57 +01:00
kervala
6b399be0f6
Changed: Minor changes
2016-02-23 16:57:34 +01:00
Nimetu
de83ae89eb
Changed: Implement multi-row select box
2016-02-23 10:52:21 +02:00
Nimetu
4d93cb8c22
Added: http-equiv refresh
2016-02-23 10:52:24 +02:00
Nimetu
272bdeb371
Changed: Use multiline text for http errors
2016-03-01 22:30:05 +02:00
kervala
1b5b1aefa5
Merge with develop
2016-02-21 20:30:16 +01:00
kervala
b0b9e18677
Changed: Use a wchar_t buffer for registry
2016-02-21 20:29:14 +01:00
kervala
b552f850e8
Merge with develop
2016-02-21 13:22:22 +01:00
kervala
917ce69668
Changed: Allow to compile WITH_NEL_TESTS without compiling tools
2016-02-21 13:20:49 +01:00
kervala
2d6e35f41d
Changed: Include wang_hash.h in NLMISC files
2016-02-21 13:19:41 +01:00
kervala
c217f28626
Merge with develop
2016-02-20 19:29:00 +01:00
kervala
379c8eeb64
Last changes for Unicode support under Windows, fixes #261
2016-02-20 19:21:39 +01:00
kervala
b2f2c2446e
Changed: Minor changes
2016-02-20 19:20:49 +01:00
kervala
008071caa3
Fixed: Display an error if unable to open a ogg file
2016-02-20 19:01:31 +01:00
kervala
64af254ece
Use Unicode of CreateProcess, issue #261
2016-02-20 18:54:32 +01:00
kervala
e9f8202701
Changed: Minor changes
2016-02-20 18:53:39 +01:00
kervala
f076548844
Use right versions of Win32 functions, issue #261
2016-02-20 18:52:57 +01:00
kervala
50afa42d93
Use ANSI versions of Win32 functions when not using Unicode text, issue #261
2016-02-20 18:38:17 +01:00
kervala
e7bebba3d3
Use Unicode versions of Win32 functions, issue #261
2016-02-20 18:30:51 +01:00
kervala
e4dc8ae94b
Replace ifstream and ofstream to manage UTF-8 filenames, issue #261
2016-02-20 18:15:04 +01:00
kervala
3c74803187
New function to format a timestamp to human readable
2016-02-20 18:10:17 +01:00
kervala
bfb32b811d
Removed useless comments/commented code
2016-02-20 18:09:24 +01:00
kervala
fa8f3b1c0f
Use CIFile to load font instead of internal Freetype functions, issue #261
2016-02-20 18:01:57 +01:00
kervala
808f7b2c30
Use new wrapper insteaf of fopen, issue #261
2016-02-20 17:56:25 +01:00
kervala
667ddd1989
Create fopen wrapper that internally uses wide characters under Windows, issue #261
2016-02-20 17:46:11 +01:00
kaetemi
e22507ed1f
Merge
2016-02-18 11:58:56 +01:00
kaetemi
f0051bb24d
Fix gl context not being deleted with custom window
2016-02-18 11:56:44 +01:00
kaetemi
8bd8b3ea3e
Move some stuff for easier debug
2016-02-18 11:55:58 +01:00
Gary Preston
816058ae75
Update indentation of tiles_model::data to match coding standard use of tabs.
2016-02-17 14:07:19 +00:00
Gary Preston
ba13914303
Fix qt4 build error.
2016-02-17 14:03:57 +00:00
Gary Preston
cb44c01ad4
Add vector include and remove extra qualification on s_InitFlags.
2016-02-16 19:01:14 +00:00
kaetemi
db5c59d607
Centralized project directory configuration mechanism
2016-02-16 02:28:03 +01:00
kaetemi
9815393c27
Move pipeline utilities into new pipeline library
2016-02-16 00:28:24 +01:00
kervala
d0e256301d
Merge with develop
2016-02-15 12:11:08 +01:00
kervala
ea37b61710
Fixed: Warning (wrong size)
2016-02-15 11:54:28 +01:00
kervala
e15c7c47a9
Merge with develop
2016-02-14 19:59:16 +01:00
kervala
395df606c0
Fixed: Windows XP doesn't support inet_pton and inet_ntop
2016-02-14 19:58:42 +01:00
kervala
db67910241
Merge with develop
2016-02-14 19:16:53 +01:00
kervala
588b832ddb
Fixed: Set _WIN32_WINNT used by WinSock for IPv6
2016-02-14 19:16:22 +01:00
kervala
5d9d57d541
Merge with develop
2016-02-14 18:21:41 +01:00
kervala
c63e211cab
Fixed: Implements IPv6 in CInetAddress
2016-02-14 18:21:09 +01:00
Nimetu
5eb1495c91
Merge with develop
2016-02-14 01:24:10 +02:00
Nimetu
a16f8a6f18
Fixed: reloading cached image with style reload:1 hint
2016-02-14 01:22:44 +02:00
kervala
24081ab894
Merge with develop
2016-02-13 23:43:04 +01:00
kervala
5fcfc87655
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)
2016-02-13 23:33:27 +01:00
kervala
daa42945b3
Changed: Display a warning when a environment variable doesn't exist
2016-02-13 23:30:18 +01:00