|
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 |
|
kervala
|
cecfbb9df9
|
Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless
--HG--
branch : develop
|
2018-02-02 21:13:07 +01:00 |
|
kervala
|
613d4ddc34
|
Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless
--HG--
branch : develop
|
2018-02-02 21:04:30 +01:00 |
|
kervala
|
e2dda1585d
|
Changed: Minor changes
--HG--
branch : develop
|
2017-12-02 16:46:44 +01:00 |
|
kervala
|
9e9b005b3b
|
Changed: Centralize hexadecimal conversions
--HG--
branch : develop
|
2017-12-02 16:44:38 +01:00 |
|
kervala
|
3e4a873429
|
Changed: Implement escapeArgument function
--HG--
branch : develop
|
2017-11-05 19:07:51 +01:00 |
|
kervala
|
d099e98dae
|
Changed: Moved strFindReplaceAll to algo.h
--HG--
branch : develop
|
2017-11-05 19:06:03 +01:00 |
|
Nimetu
|
ecc7cac376
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-10-02 13:54:08 +03:00 |
|
Nimetu
|
6b7617f8e1
|
Changed: Expand/collapse all tree node childs with right click
--HG--
branch : develop
|
2017-10-02 13:52:44 +03:00 |
|
Nimetu
|
c7e0b56a40
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-09-02 23:14:34 +03:00 |
|
Nimetu
|
d6dcf7415a
|
Fixed: Multiline text inside lists
--HG--
branch : develop
|
2017-09-02 23:13:04 +03:00 |
|
Nimetu
|
30512804d5
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-07-12 21:23:08 +03:00 |
|
Nimetu
|
455a923031
|
Added: clear_on_escape property to edit box
--HG--
branch : develop
|
2017-07-12 20:32:42 +03:00 |
|
Nimetu
|
71d969c40b
|
Changed: Keep track of HSTS header and rewrite http to https as needed
--HG--
branch : develop
|
2017-07-11 22:23:38 +03:00 |
|
Nimetu
|
9a3a352142
|
Changed: Refactor curl certificate loading (issue #314)
--HG--
branch : develop
|
2017-07-04 00:34:11 +03:00 |
|
Nimetu
|
2b7dac4450
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-06-08 22:38:03 +03:00 |
|
Nimetu
|
f80c8e7d81
|
Added: Image mouseover effect
--HG--
branch : develop
|
2017-06-08 22:37:19 +03:00 |
|
Nimetu
|
087958eb6c
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-06-01 14:06:04 +03:00 |
|
Nimetu
|
9394906182
|
Added: -ryzom-modulate-color style to enable modulation with global color
--HG--
branch : develop
|
2017-06-01 13:51:32 +03:00 |
|
Nimetu
|
fcbdbd17b7
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-05-14 01:27:20 +03:00 |
|
Nimetu
|
6c01ded28d
|
Fixed: Redirect for image requests
--HG--
branch : develop
|
2017-05-14 01:03:49 +03:00 |
|
Nimetu
|
eb23a3b61c
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-04-25 00:23:09 +03:00 |
|
kervala
|
f739ed9e62
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-04-22 18:19:33 +02:00 |
|
kervala
|
e94b06066f
|
Fixed: LibXml must be initialized only once and xmlSetGenericErrorFunc set a global function (calling it for each instance of CIXml is a mistake)
--HG--
branch : develop
|
2017-04-22 18:15:43 +02:00 |
|
Nimetu
|
108759952e
|
Changed: Use http cache headers for image cache
--HG--
branch : develop
|
2017-04-20 21:19:51 +03:00 |
|
Nimetu
|
3d09dd2094
|
Changed: Save cookies from image request
--HG--
branch : develop
|
2017-04-20 21:19:01 +03:00 |
|
kervala
|
90c1a21ba6
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-04-20 13:53:59 +02:00 |
|
kervala
|
f23600cd30
|
Fixed: Compilation in 32 bits with GCC (patch provided by Alistair Leslie-Hughes, thanks a lot)
--HG--
branch : develop
|
2017-04-20 13:53:36 +02:00 |
|
Nimetu
|
8f5588e0ec
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-04-16 22:45:39 +03:00 |
|
Nimetu
|
20c216ecda
|
Added: Basic queue for curl downloads
--HG--
branch : develop
|
2017-04-16 22:01:44 +03:00 |
|
Nimetu
|
88c81e8895
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-03-14 23:42:52 +02:00 |
|
Nimetu
|
9d0a2556d0
|
Changed: Refactor CViewLink to be able to use custom action handlers
--HG--
branch : develop
|
2017-01-21 13:29:20 +02:00 |
|
kervala
|
84618b4fbe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-01-01 22:45:29 +01:00 |
|
kervala
|
534630bdcc
|
Changed: Implement CBitmap::setPixelColor
--HG--
branch : develop
|
2017-01-01 22:42:37 +01:00 |
|
kervala
|
c91cd27a25
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-24 14:24:44 +01:00 |
|
kervala
|
d8ffb10df8
|
Changed: Use a global C64BitsParts union to avoid strict aliasing warnings
--HG--
branch : develop
|
2016-12-24 14:01:21 +01:00 |
|
kervala
|
8884a8fcb1
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-19 17:48:07 +01:00 |
|
kervala
|
6570b26297
|
Fixed: Virtual methods with different parameters
--HG--
branch : develop
|
2016-12-19 17:46:07 +01:00 |
|
kervala
|
c178730b80
|
Fixed: Virtual method with different parameters warning
--HG--
branch : develop
|
2016-12-19 16:37:16 +01:00 |
|
kervala
|
929cf93b87
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-19 13:58:14 +01:00 |
|
kervala
|
31a540b35d
|
Changed: Replace size() comparisons by empty() ones
--HG--
branch : develop
|
2016-12-19 13:15:25 +01:00 |
|
kervala
|
8da20b30cc
|
Changed: Merged changes from compatibility-develop that should also be in develop
--HG--
branch : develop
|
2016-12-18 20:39:16 +01:00 |
|
kervala
|
4e99767ae2
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-18 14:47:16 +01:00 |
|
kervala
|
cbf2c744f0
|
Changed: Replace some const char* by std::string
--HG--
branch : develop
|
2016-12-18 13:45:07 +01:00 |
|
ulukyn@gmail.com
|
68e6dbaf9a
|
Fusion
--HG--
branch : compatibility-develop
|
2016-12-13 21:16:30 +01:00 |
|
ulukyn@gmail.com
|
9e73cd8d22
|
Added: Export usefull cursor and shape functions in lua:
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape
--HG--
branch : compatibility-develop
|
2016-12-10 22:04:33 +01:00 |
|
ulukyn@gmail.com
|
bd7b703f3a
|
Added: Add lua function to have an icon at left of menu option
--HG--
branch : compatibility-develop
|
2016-12-10 21:58:15 +01:00 |
|
kervala
|
f085121937
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-10 19:52:43 +01:00 |
|
kervala
|
083f44ec32
|
Fixed: Compilation
--HG--
branch : develop
|
2016-12-10 19:36:41 +01:00 |
|
kervala
|
50b6af6d3d
|
Fixed: Strict aliasing warnings
--HG--
branch : develop
|
2016-12-10 18:55:31 +01:00 |
|