Commit graph

22699 commits

Author SHA1 Message Date
Guillaume Dupuy
c2049935a4 Support for an item beeing in multiple groups
--HG--
branch : item_group
2017-03-11 19:25:45 +01:00
Guillaume Dupuy
5dcc7932ff Forgot a return
--HG--
branch : item_group
2017-03-11 01:06:39 +01:00
Guillaume Dupuy
d4b2e64c21 Fix compilation
--HG--
branch : item_group
2017-03-10 11:51:36 +01:00
Guillaume Dupuy
8880c37fb2 Remove C++11 features
--HG--
branch : item_group
2017-03-09 21:31:26 +01:00
Guillaume Dupuy
54ff3a88d5 Fix a crash
--HG--
branch : item_group
2017-03-09 20:52:02 +01:00
Guillaume Dupuy
6c9bbb8c0b Allow support for room / guild movement
--HG--
branch : item_group
2017-03-09 18:54:12 +01:00
Guillaume Dupuy
ecf2ac530c Remove usePrice from xml, it's now used if minPrice or maxPrice are not default value
--HG--
branch : item_group
2017-03-09 17:58:07 +01:00
Guillaume Dupuy
9fffec8ef1 Added interface for item groups
--HG--
branch : item_group
2017-03-09 17:47:25 +01:00
Guillaume Dupuy
fdbc261a7e First working prototype of itemgroups
--HG--
branch : item_group
2017-03-08 17:30:09 +01:00
Nimetu
5c56eb400e Changed: Workaround for white/black textures on Intel GPU (issue #310)
--HG--
branch : develop
2017-03-01 20:36:25 +02:00
Cédric OCHS
9bc910d102 Merged in Glorf/ryzomcore/fix_compilation_mac (pull request #152)
Fix compilation (tools + server) on OSX

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
2017-04-29 09:09:09 +00:00
Guillaume Dupuy
431e2349d5 Fix build with macOS clang
--HG--
branch : fix_compilation_mac
2017-04-28 23:58:16 +02:00
Guillaume Dupuy
d5080e07cb Fix compilation on mac (thanks Siela for the fixes !)
--HG--
branch : fix_compilation_mac
2017-04-28 23:56:06 +02:00
kervala
076a50e3fb Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool
--HG--
branch : develop
2017-02-27 10:57:24 +01:00
kervala
fded57d3a1 Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool 2017-02-27 10:57:24 +01:00
Nimetu
cea9549cd8 Added: Clickable urls in chat text (issue 282)
--HG--
branch : develop
2017-01-21 13:29:34 +02:00
Nimetu
2e5bcdf248 Added: Clickable urls in chat text (issue 282) 2017-01-21 13:29:34 +02:00
Nimetu
5b0b92710a Added: copy_to_clipboard action handler
--HG--
branch : develop
2017-01-21 13:29:24 +02:00
Nimetu
b9ab826feb Added: copy_to_clipboard action handler 2017-01-21 13:29:24 +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
Nimetu
b724f9698c Changed: Refactor CViewLink to be able to use custom action handlers 2017-01-21 13:29:20 +02:00
Nimetu
d7a797bf4a Changed: Ensure that menu resizes from child elements
--HG--
branch : develop
2017-01-21 13:29:15 +02:00
Nimetu
3ae1a9f3ac Changed: Ensure that menu resizes from child elements 2017-01-21 13:29:15 +02:00
Nimetu
472ccb758a Fixed: Wrong size for list element
--HG--
branch : develop
2017-01-21 13:29:12 +02:00
Nimetu
81350033fa Fixed: Wrong size for list element 2017-01-21 13:29:12 +02:00
Nimetu
524f80c8a0 Fixed: Crash when trying to navigate to non-existing #anchor
--HG--
branch : develop
2017-01-21 13:29:05 +02:00
Nimetu
ea95d93fac Fixed: Crash when trying to navigate to non-existing #anchor 2017-01-21 13:29:05 +02:00
Nimetu
fa8e1d95db Changed: Improve cURL error message for failed requests
--HG--
branch : develop
2017-01-21 13:28:48 +02:00
Nimetu
661473d9cd Changed: Improve cURL error message for failed requests 2017-01-21 13:28:48 +02:00
Nimetu
0f5ec6c0b4 Fixed: Windowed resolution resetting when closing from login/outgame views.
--HG--
branch : develop
2017-01-12 13:29:47 +02:00
Nimetu
795c91bcc8 Fixed: Windowed resolution resetting when closing from login/outgame views. 2017-01-12 13:29:47 +02:00
ulukyn
3d270b7a1f Fixed: Scenographic Editor lua issues 2017-01-11 16:27:25 +01:00
ulukyn@gmail.com
c43627159c Fixed: Scenographic Editor lua issues
--HG--
branch : compatibility-develop
2017-01-11 16:27:25 +01:00
Nimetu
109725fc9e Changed: Move dyn channel commands (/0, /1 ..) to commands.xml
--HG--
branch : develop
2017-01-11 15:12:06 +02:00
Nimetu
9db20a28cb Changed: Move dyn channel commands (/0, /1 ..) to commands.xml 2017-01-11 15:12:06 +02:00
Nimetu
169ab7d907 Merge with develop 2017-01-10 15:09:55 +02:00
Nimetu
ab5aa5b2c4 Merge with develop
--HG--
branch : compatibility-develop
2017-01-10 15:09:55 +02:00
Nimetu
3e95a8b89f Fixed: Client crash on bad PNG file from webig download.
--HG--
branch : develop
2017-01-10 14:07:11 +02:00
Nimetu
9aae361c7b Fixed: Client crash on bad PNG file from webig download. 2017-01-10 14:07:11 +02:00
Nimetu
a7ca4ec3b9 Changed: Minor change
--HG--
branch : develop
2017-01-10 14:07:06 +02:00
Nimetu
44db61b463 Changed: Minor change 2017-01-10 14:07:06 +02:00
ulukyn
f8b7db0bfe Fixed: Scenographic Editor crash the client (revert bad commit of actions.h) 2017-01-10 12:35:53 +01:00
ulukyn@gmail.com
8dce467417 Fixed: Scenographic Editor crash the client (revert bad commit of actions.h)
--HG--
branch : compatibility-develop
2017-01-10 12:35:53 +01:00
ulukyn
57057b7794 Fixed: Scenographic Editor crash the client 2017-01-10 12:32:44 +01:00
ulukyn@gmail.com
56c4674d10 Fixed: Scenographic Editor crash the client
--HG--
branch : compatibility-develop
2017-01-10 12:32:44 +01:00
kervala
6344d0e5cc Merge with develop 2017-01-04 14:25:23 +01:00
kervala
47ac7ddd94 Merge with develop
--HG--
branch : compatibility-develop
2017-01-04 14:25:23 +01:00
kervala
9541e78219 Changed: Exit if line is truncated
--HG--
branch : develop
2017-01-04 14:24:25 +01:00
kervala
fd78d7ca74 Changed: Exit if line is truncated 2017-01-04 14:24:25 +01:00
kervala
5af01c7e24 Fixed: Support for quads and any number of vertices for a face
--HG--
branch : develop
2017-01-04 14:24:02 +01:00