Commit graph

3239 commits

Author SHA1 Message Date
kervala
7f4fa540e1 Changed: Display a warning when SetWindowTextW fails
--HG--
branch : develop
2016-10-25 11:49:46 +02:00
kervala
ea30d0051b Changed: Use FMod driver by default under Windows (to verify if it's fixing crash when teleporting)
--HG--
branch : compatibility-develop
2016-10-24 13:54:06 +02:00
kervala
68163157ba Merge with develop
--HG--
branch : compatibility-develop
2016-10-23 16:29:49 +02:00
kervala
59c9b587f0 Changed: New format/f parameter for build_interface to force a format (png or tga)
--HG--
branch : develop
2016-10-23 16:28:51 +02:00
kervala
564f00014a Merge with develop
--HG--
branch : compatibility-develop
2016-10-22 16:55:51 +02:00
kervala
577e49ef91 Changed: Minor changes
--HG--
branch : develop
2016-10-22 16:52:34 +02:00
kervala
d8f92e1cee Fixed: Ignore extension when looking for textures
--HG--
branch : develop
2016-10-22 16:52:20 +02:00
kervala
891784f23d Changed: Write UNIX EOL in UV files
--HG--
branch : develop
2016-10-22 16:50:31 +02:00
kervala
7f74f70e6f Changed: Allow to extract interface elements with build_interface
--HG--
branch : develop
2016-10-22 16:49:57 +02:00
kervala
b08d1f979d Changed: Typo
--HG--
branch : develop
2016-10-22 16:49:19 +02:00
kervala
414d4de46b Fixed: Return an error when a required argument is missing
--HG--
branch : develop
2016-10-22 16:49:12 +02:00
kervala
8b239df6a9 Changed: Implement and use CBitmap::makeTransparentPixelsBlack()
--HG--
branch : develop
2016-10-22 16:47:25 +02:00
kervala
7363803b2c Merge with develop
--HG--
branch : compatibility-develop
2016-10-21 14:27:31 +02:00
kervala
73e9806fe7 Changed: Return error message as an UTF-8 string
--HG--
branch : develop
2016-10-21 12:55:02 +02:00
kervala
2e7af6ab0d Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:08:48 +02:00
kervala
b2f5fed3bf Changed: Replace sscanf by fromString
--HG--
branch : develop
2016-10-20 12:34:38 +02:00
kervala
3ae41bfa58 Changed: Minor changes
--HG--
branch : develop
2016-10-20 12:34:25 +02:00
kervala
517336923f Changed: Replace sscanf by fromString
--HG--
branch : develop
2016-10-20 12:33:37 +02:00
kervala
497c488166 Fixed: Wrong syntax for NL_I64
--HG--
branch : develop
2016-10-20 12:22:57 +02:00
kervala
0238b30489 Merge with develop
--HG--
branch : compatibility-develop
2016-10-18 10:27:44 +02:00
kervala
94a3626cd3 Changed: Minor change
--HG--
branch : develop
2016-10-18 10:27:09 +02:00
kervala
14ee62676f Merge with develop
--HG--
branch : compatibility-develop
2016-10-17 11:49:38 +02:00
kervala
0e3785b1cf Fixed: Call Cocoa API when required to not conflict with Qt
--HG--
branch : develop
2016-10-17 11:48:58 +02:00
kervala
c9fa01f670 Changed: Minor change
--HG--
branch : develop
2016-10-17 11:24:49 +02:00
kervala
c3c377e4a6 Merge with develop
--HG--
branch : compatibility-develop
2016-10-15 17:16:34 +02:00
kervala
85c2535a1f Fixed: Deadlock while calling CoUninitialize()
--HG--
branch : develop
2016-10-15 17:11:53 +02:00
kervala
3ab030e359 Merge with develop
--HG--
branch : compatibility-develop
2016-10-10 18:55:28 +02:00
kervala
acdbbd63b3 Changed: Fix english comment
--HG--
branch : develop
2016-10-10 18:53:11 +02:00
kervala
fd3b681203 Merge with develop
--HG--
branch : compatibility-develop
2016-10-01 18:43:48 +02:00
kervala
f4f8ec29d3 Changed: Implement AlphaLuminance resample
--HG--
branch : develop
2016-10-01 18:43:08 +02:00
kervala
ac9dcd663d Merge with develop
--HG--
branch : compatibility-develop
2016-09-28 23:55:21 +02:00
kervala
e7b23c958a Fixed: Connexion -> Connection typo
--HG--
branch : develop
2016-09-28 23:42:01 +02:00
kervala
881e5457ac Merge with develop
--HG--
branch : compatibility-develop
2016-09-25 10:50:38 +02:00
kervala
07ddb63d61 Changed: Add a new line after description
--HG--
branch : develop
2016-09-25 10:50:13 +02:00
kervala
a41ae065d8 Changed: Remove alternative formats for parameters (too verbose)
--HG--
branch : develop
2016-09-25 10:49:55 +02:00
kervala
dcf90f381f Merge with develop
--HG--
branch : compatibility-develop
2016-09-24 15:54:47 +02:00
kervala
130b270380 Fixed: tga2dds doesn't generate mipmaps
--HG--
branch : develop
2016-09-24 15:54:28 +02:00
kervala
ce576954e0 Merge with develop
--HG--
branch : compatibility-develop
2016-09-24 14:22:22 +02:00
kervala
ec5deea3f0 Changed: Generate an exception if file is not a supported bitmap format
--HG--
branch : develop
2016-09-24 14:19:35 +02:00
kervala
3d84a68df4 Merge with develop
--HG--
branch : compatibility-develop
2016-09-23 13:32:12 +02:00
kervala
536483f8a7 Changed: Factorize saving to right bitmap format
--HG--
branch : develop
2016-09-23 13:31:41 +02:00
kervala
35b4a3d98a Changed: Minor changes
--HG--
branch : develop
2016-09-23 13:29:50 +02:00
kervala
39275558c0 Changed: Simplify outString (a simple printf should be enough)
--HG--
branch : develop
2016-09-23 13:29:00 +02:00
kervala
20f4825686 Changed: Use CCmdArgs for build_interface
--HG--
branch : develop
2016-09-23 13:26:55 +02:00
Nimetu
935b80cc68 Merge with develop
--HG--
branch : compatibility-develop
2016-09-21 20:12:51 +03:00
Nimetu
02dd8db21f Added: Lua function to render html string as new webpage
--HG--
branch : develop
2016-09-21 20:11:13 +03:00
kervala
0037b40751 Merge with develop
--HG--
branch : compatibility-develop
2016-09-19 14:52:47 +02:00
kervala
b7d37b71e3 Fixed: Compilation without PCH
--HG--
branch : develop
2016-09-19 14:34:49 +02:00
kervala
6d4b9b5235 Merge with develop
--HG--
branch : compatibility-develop
2016-09-16 19:25:17 +02:00
kervala
7422334e97 Changed: Only call CoUninitialize if CoInitialize(Ex) succeeded
--HG--
branch : develop
2016-09-16 19:24:43 +02:00
kervala
3d461d9dd5 Merge with develop
--HG--
branch : compatibility-develop
2016-09-12 14:39:38 +02:00
kervala
32f682d5dc Fixed: Compilation under OS X in 32 bits
--HG--
branch : develop
2016-09-12 14:39:07 +02:00
kervala
aacb492c30 Changed: Updated glext.h
--HG--
branch : develop
2016-09-12 14:38:49 +02:00
kervala
904e17475e Merge with develop
--HG--
branch : compatibility-develop
2016-09-03 10:15:39 +02:00
kervala
eb878d97d1 Fixed: Compilation under macOS 10.12
--HG--
branch : develop
2016-09-03 10:04:56 +02:00
kervala
53290cb212 Changed: Initialize ARBFragmentShader to false if DisableHardwarePixelProgram is set
--HG--
branch : develop
2016-09-03 10:04:09 +02:00
kervala
8f7a28f5c9 Changed: Get length of song in FMod driver too (issue #59)
--HG--
branch : develop
2016-09-03 10:03:33 +02:00
Nimetu
0766ec46f8 Merge with develop
--HG--
branch : compatibility-develop
2016-08-30 21:27:56 +03:00
Nimetu
f2dfd3cd8e Changed: Also return song length with title
--HG--
branch : develop
2016-08-30 21:25:46 +03:00
kervala
96f7cd9f59 Merge with develop
--HG--
branch : compatibility-develop
2016-08-06 20:12:39 +02:00
kervala
388cb6445a Fixed: Include initguid.h to avoid linking against dxguid.lib
--HG--
branch : develop
2016-08-06 20:09:40 +02:00
Nimetu
869e8572cf Merge with develop
--HG--
branch : compatibility-develop
2016-07-25 19:27:04 +03:00
Nimetu
7aeedf7ad4 Fixed: Bad typo
--HG--
branch : develop
2016-07-25 19:26:49 +03:00
Nimetu
16eeb70f61 Merge with develop
--HG--
branch : compatibility-develop
2016-07-24 16:09:25 +03:00
Nimetu
357973aa10 Added: font style to <pre> element
--HG--
branch : develop
2016-07-24 16:07:36 +03:00
Nimetu
fe3601d664 Added: font-family style option
--HG--
branch : develop
2016-07-24 16:07:31 +03:00
Nimetu
9fb14c42d8 Added: Monospace font options
--HG--
branch : develop
2016-07-24 16:07:18 +03:00
Nimetu
58bf225891 Changed: Support custom font
--HG--
branch : develop
2016-07-24 16:05:04 +03:00
Nimetu
afc08d2efd Added: Possible to use multiple fonts at the same time
--HG--
branch : develop
2016-07-24 16:03:37 +03:00
Nimetu
705d3a6168 Merge with develop
--HG--
branch : compatibility-develop
2016-07-23 11:28:22 +03:00
Nimetu
ef703ed6de Fixed: Double tooltip on web image links
--HG--
branch : develop
2016-07-20 14:31:44 +03:00
kervala
90362c3609 Merge with develop
--HG--
branch : compatibility-develop
2016-06-26 19:43:53 +02:00
kervala
8d3ca27424 Changed: Don't need to hardcode a text offset because the old font was not aligned
--HG--
branch : develop
2016-06-26 19:40:10 +02:00
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
2016-06-26 15:17:32 +02:00
Nimetu
8f9ab3c024 Merge with develop
--HG--
branch : compatibility-develop
2016-06-25 22:30:51 +03:00
Nimetu
69f956583a Added: HTML css hsl(), hsla() color
--HG--
branch : develop
2016-06-25 22:28:48 +03:00
Nimetu
c05fcd9b34 Added: HTML css rgb() and rgba() color
--HG--
branch : develop
2016-06-25 19:32:43 +03:00
Nimetu
5db76bfe99 Added: HTML #RGBA color
--HG--
branch : develop
2016-06-25 18:17:53 +03:00
Nimetu
07a68281a5 Fixed: Inconsistent html color parsing
--HG--
branch : develop
2016-06-25 17:45:21 +03:00
kervala
1553937124 Merge with develop
--HG--
branch : compatibility-develop
2016-06-19 21:10:23 +02:00
kervala
83c97c6c36 Changed: Init CSystemUtils in INelContext
--HG--
branch : develop
2016-06-19 20:48:30 +02:00
kervala
3386ee874e Merge with develop
--HG--
branch : compatibility-develop
2016-06-18 22:41:12 +02:00
kervala
a8fac8f8e9 Changed: Under Linux, it's recommended to put user application data in ~/.local/share
--HG--
branch : develop
2016-06-18 19:47:05 +02:00
kervala
c9ad23a812 Merge with develop
--HG--
branch : compatibility-develop
2016-06-16 17:16:27 +02:00
kervala
306aae7af9 Changed: Only display virtual screen size if DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag is defined
--HG--
branch : develop
2016-06-16 17:15:45 +02:00
kervala
d80371d459 Changed: Only display this message in debug
--HG--
branch : develop
2016-06-16 17:14:48 +02:00
kervala
1aea0f981c Merge with develop
--HG--
branch : compatibility-develop
2016-06-14 20:18:10 +02:00
kervala
995120317d Fixed: Usage of wglEnumGpuDevicesNV
--HG--
branch : develop
2016-06-14 19:34:43 +02:00
kervala
2ab16f61ef Changed: Updated OpenGL headers
--HG--
branch : develop
2016-06-14 19:33:41 +02:00
kervala
fa01980634 Merge with develop
--HG--
branch : compatibility-develop
2016-06-12 15:44:48 +02:00
kervala
bd766614bc Changed: Replaced spaces by tabs
--HG--
branch : develop
2016-06-12 14:17:36 +02:00
Nimetu
f90fa23206 Merge with develop
--HG--
branch : compatibility-develop
2016-06-12 12:49:14 +03:00
Nimetu
b5a4ba313d Fixed: Keep \n inside <textarea>
--HG--
branch : develop
2016-06-12 12:46:44 +03:00
Nimetu
69728b9a2e Changed: CSS inherit value for some properties
--HG--
branch : develop
2016-06-12 12:46:42 +03:00
Nimetu
f201abe6db Changed: Set <textarea>, <input> font style
--HG--
branch : develop
2016-06-12 10:30:16 +03:00
Nimetu
caf8c5195c Added: Rows attribute to <textarea> element
--HG--
branch : develop
2016-06-12 10:22:22 +03:00
Nimetu
e8c7cdbb32 Added: Minimum lines option to multiline text
--HG--
branch : develop
2016-06-12 10:22:22 +03:00
kervala
7ebc0ae072 Merge with develop
--HG--
branch : compatibility-develop
2016-06-07 20:01:47 +02:00
kervala
4a2fe97f95 Fixed: Support for all Windows 10 products types
--HG--
branch : develop
2016-06-07 20:01:18 +02:00
kervala
88f5c244d3 Merge with develop
--HG--
branch : compatibility-develop
2016-06-04 17:05:41 +02:00
kervala
2e02f20c83 Fixed: Error 18 when moving a file between different file systems
--HG--
branch : develop
2016-06-04 17:00:40 +02:00
Nimetu
52f81ca56d Merge with develop
--HG--
branch : compatibility-develop
2016-06-04 10:36:21 +03:00
kervala
b9ade7142a Merge with develop
--HG--
branch : compatibility-develop
2016-05-30 17:51:54 +02:00
kervala
4b46b9f18f Fixed: Read NeL crash reports as UTF-8 files
--HG--
branch : develop
2016-05-30 17:51:19 +02:00
kervala
ec7cc189df Merge with develop
--HG--
branch : compatibility-develop
2016-05-27 22:24:20 +02:00
kervala
cb8bb5f6f4 Changed: No need to change VSync if same value
--HG--
branch : develop
2016-05-27 22:16:44 +02:00
kervala
b29441f22e Changed: Display a warning if setSwapVBLInterval is called before OpenGL initialization
--HG--
branch : develop
2016-05-27 22:16:29 +02:00
kervala
ae7fa4da2e Changed: Instead of forcing VSYNC, get initial value
--HG--
branch : develop
2016-05-27 22:15:58 +02:00
kervala
eea1bbb0e2 Fixed: VSync inverted under Windows and in OpenGL ES
--HG--
branch : develop
2016-05-27 22:15:14 +02:00
kervala
86084649a2 Merge with develop
--HG--
branch : compatibility-develop
2016-05-26 19:36:25 +02:00
kervala
ee2938e3cb Changed: Use uint instead of unsigned
--HG--
branch : develop
2016-05-25 23:19:46 +02:00
kervala
4b1959a560 Changed: Replace size() comparisons by empty()
--HG--
branch : develop
2016-05-25 23:18:11 +02:00
Nimetu
9ba0ac65ea Fixed: Send user-agent string and cookies with image request.
--HG--
branch : develop
2016-05-25 12:08:12 +03:00
Nimetu
85051340e1 Changed: Move addLink code to beginElement
--HG--
branch : develop
2016-05-25 12:08:08 +03:00
Nimetu
250a94e186 Changed: minor changes
--HG--
branch : develop
2016-05-25 12:08:06 +03:00
Nimetu
60a739955b Merge with develop
--HG--
branch : compatibility-develop
2016-05-14 13:47:03 +03:00
Nimetu
f15926dd7e Changed: Remove legacy HTTPCurrentDomain variable
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
Nimetu
ae46d76d88 Fixed: Parsing url authority when path is empty
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
Nimetu
8aa2a3ced6 Changed: Rename CUrlParser domain variable
--HG--
branch : develop
2016-05-14 12:53:09 +03:00
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