|
0d1f1067bc
|
Merge remote-tracking branch 'upstream/develop' into ryzomcore
|
2018-10-14 20:05:30 +02:00 |
|
root
|
cf1db62ab8
|
correction pour la compilation sous windows à cause des merges RC mal fait
|
2018-03-25 12:04:43 +02:00 |
|
|
1c898ea0b2
|
Merge branch 'ryzomcore' into ryzomcore+develop
# Conflicts:
# .hgtags
# .travis.yml
# code/CMakeModules/FindMSVC.cmake
# code/ryzom/client/src/steam_client.cpp
|
2018-03-24 18:18:50 +01:00 |
|
Nimetu
|
8ef8b2d62d
|
Fixed: checkCoords needs XReal to be same as in updateCoords
--HG--
branch : develop
|
2018-09-27 21:42:31 +03:00 |
|
Nimetu
|
c2ffa714d2
|
Fixed: Wrong width for container list element
--HG--
branch : develop
|
2018-09-27 12:36:09 +03:00 |
|
Nimetu
|
4f7c082a4a
|
Fixed: Wrong text width
--HG--
branch : develop
|
2018-09-27 08:30:33 +03:00 |
|
Nimetu
|
f5c8335fa9
|
Fixed: Wrong table width if colspan is used
--HG--
branch : develop
|
2018-08-26 22:58:48 +03:00 |
|
Nimetu
|
ea95d8e091
|
Fixed: HTML list element invalidates content on each frame
--HG--
branch : develop
|
2018-08-26 22:58:48 +03:00 |
|
Nimetu
|
dd03e1f0b1
|
Fixed: Remove onenter callback from html textarea
--HG--
branch : develop
|
2018-08-18 14:15:32 +03:00 |
|
kervala
|
729ba2ebbd
|
Fixed: Typo
--HG--
branch : develop
|
2018-08-18 11:51:55 +02:00 |
|
kervala
|
6097ada1fa
|
Changed: Removed other throws
--HG--
branch : develop
|
2018-08-18 11:20:37 +02:00 |
|
kervala
|
58efd082c1
|
Changed: Don't include curl.h in headers to avoid dependencies on CURL for more files that required
--HG--
branch : develop
|
2018-08-18 10:57:33 +02:00 |
|
kervala
|
40dc2188f2
|
Fixed: Check CURL backend on old CURL versions (tested with 7.22)
--HG--
branch : develop
|
2018-08-18 10:53:04 +02:00 |
|
Nimetu
|
adc89b3a82
|
Fixed: style inheritance for underline, strikethrough
--HG--
branch : develop
|
2018-08-18 09:16:14 +03:00 |
|
kervala
|
b86bf43090
|
Fixed: Simplify certificates management
--HG--
branch : develop
|
2018-08-11 21:47:50 +02:00 |
|
Nimetu
|
15355e3815
|
Changed: shadow attributes for CViewText and editbox templates
--HG--
branch : develop
|
2018-08-11 15:33:01 +03:00 |
|
Nimetu
|
33f6b64bb9
|
Changed: Add text-shadow and text-stroke style properties
--HG--
branch : develop
|
2018-08-10 14:09:34 +03:00 |
|
Nimetu
|
1525b03a83
|
Changed: Extend style attribute to other tags
--HG--
branch : develop
|
2018-08-11 09:59:01 +03:00 |
|
Nimetu
|
d32877ddc9
|
Changed: Keep track of style states in a single struct
--HG--
branch : develop
|
2018-08-10 16:00:43 +03:00 |
|
kervala
|
91fa4d3f5f
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-09 19:54:08 +02:00 |
|
kervala
|
c13b758be9
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-09 19:47:44 +02:00 |
|
kervala
|
184d3698c9
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-09 19:38:33 +02:00 |
|
kervala
|
dcaf417aee
|
Changed: Minor changes
--HG--
branch : develop
|
2018-08-09 14:34:28 +02:00 |
|
kervala
|
cc6ed038b9
|
Fixed: Don't use memory aligned functions while debugging with VC++
--HG--
branch : develop
|
2018-08-09 14:32:00 +02:00 |
|
kervala
|
78670dfdda
|
Fixed: Compilation with VC++ 2010
--HG--
branch : develop
|
2018-08-09 14:31:17 +02:00 |
|
kervala
|
f39c6ed3c6
|
Fixed: Warnings
--HG--
branch : develop
|
2018-08-09 14:30:13 +02:00 |
|
kervala
|
facc5f6d28
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-09 14:27:42 +02:00 |
|
kervala
|
443cc7df65
|
Fixed: Don't throw an exception when a certifcate can't be found
--HG--
branch : develop
|
2018-08-08 20:55:40 +02:00 |
|
kervala
|
8a1588c147
|
Fixed: Also use SSL context callback when manually using Windows CA certs
--HG--
branch : develop
|
2018-08-08 20:55:14 +02:00 |
|
kervala
|
c4888b2d5b
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-08 20:54:09 +02:00 |
|
kervala
|
675f85c288
|
Fixed: Warnings, throw(type) deprecated in C++11 and removed in C++17
--HG--
branch : develop
|
2018-08-08 20:37:51 +02:00 |
|
kervala
|
53bae35fc4
|
Fixed: Use GlobalMemoryStatusEx instead of GlobalMemoryStatus (returns 64 bits numbers)
--HG--
branch : develop
|
2018-08-08 09:39:40 +02:00 |
|
kervala
|
b4f69007f6
|
Fixed: Compilation
--HG--
branch : develop
|
2018-08-07 20:29:39 +02:00 |
|
kervala
|
6966bc1a12
|
Fixed: Compilation with older CURL
--HG--
branch : develop
|
2018-08-07 18:41:04 +02:00 |
|
kervala
|
d9e6d34fcc
|
Changed: Make sslCtxFunction private and don't include curl.h in header
--HG--
branch : develop
|
2018-08-07 18:40:48 +02:00 |
|
kervala
|
a0c3a3adc5
|
Fixed: Link nelgui to Security framework (fix compilation with curl using DarwinSSL backend)
--HG--
branch : develop
|
2018-08-07 13:29:36 +02:00 |
|
kervala
|
ce31c4c17f
|
Changed: Minor changes
--HG--
branch : develop
|
2018-08-05 14:59:28 +02:00 |
|
kervala
|
1dc5ad039e
|
Fixed: Link NELGUI to Crypt32.lib and Cryptui.lib under Windows
--HG--
branch : develop
|
2018-08-05 14:59:06 +02:00 |
|
kervala
|
f04fd9809c
|
Fixed: Allow to use custom CA Certificates under all platforms if libcurl compiled with OpenSSL for WebIG and login
--HG--
branch : develop
|
2018-08-05 14:31:53 +02:00 |
|
kervala
|
1000e29a96
|
Fixed: Compilation with VC++ 2013
--HG--
branch : develop
|
2018-07-31 18:36:36 +02:00 |
|
kervala
|
307eb77e63
|
Changed: Generate version_nl.h in include/nel/misc
--HG--
branch : develop
|
2018-07-28 11:31:32 +02:00 |
|
Jan Boon
|
13e2da698a
|
Fix build under Visual Studio 2008
--HG--
branch : develop
|
2018-07-03 16:09:15 +08:00 |
|
ulukyn
|
0863830734
|
Added: Downloadable textures in texture property of CViewBitmap
--HG--
branch : develop
|
2018-06-12 14:43:20 +02:00 |
|
ulukyn
|
1a128ac269
|
Added: Diplay:inline-block option to style of div in group_html
--HG--
branch : develop
|
2018-06-12 13:39:33 +02:00 |
|
ulukyn
|
6573d96fd7
|
Fixed: enable _TrustedDomain when html is rendered by lua code
--HG--
branch : develop
|
2018-05-31 21:03:05 +02:00 |
|
Nimetu
|
97d0d45384
|
Fixed: lua:showDiv accessing already deleted objects
--HG--
branch : develop
|
2018-05-29 22:34:29 +03:00 |
|
Nimetu
|
e2617bfe9b
|
Fixed: Decoding dds with improper width/height
--HG--
branch : develop
|
2018-05-28 14:46:16 +03:00 |
|
Nimetu
|
30caac063e
|
Fixed: Wrong text width when used inside html list element
--HG--
branch : develop
|
2018-05-23 22:18:19 +03:00 |
|
Nimetu
|
ebbb270bc1
|
Fixed: Use target_stepy to calculate dy for scrolling
--HG--
branch : develop
|
2018-05-13 17:00:45 +03:00 |
|
Nimetu
|
e625f2b3c7
|
Fixed: Mouse wheel should scroll target object instead scroll bar (fixes issue #327)
--HG--
branch : develop
|
2018-05-10 12:46:11 +03:00 |
|