Commit graph

22571 commits

Author SHA1 Message Date
Nimetu
f52abb2933 Merge with develop
--HG--
branch : compatibility-develop
2017-03-18 14:55:33 +02:00
Nimetu
c247b43a9b Changed: Fix ingame keys list
--HG--
branch : develop
2017-03-18 14:55:15 +02:00
Guillaume Dupuy
f222d1736a Fix uninit/release
--HG--
branch : item_group
2017-03-18 01:45:40 +01:00
Guillaume Dupuy
6af0fd168c Use SLOT_EQUIPEMENT instead of SLOTTYPE
--HG--
branch : item_group
2017-03-16 13:36:56 +01:00
Guillaume Dupuy
08306e6a69 Minor fixes
--HG--
branch : item_group
2017-03-16 12:47:36 +01:00
Guillaume Dupuy
1d36ea9acc Minor interface fixes
--HG--
branch : item_group
2017-03-16 12:24:20 +01:00
Guillaume Dupuy
83dea32f41 Add support for removing items before equipping an item group
--HG--
branch : item_group
2017-03-16 12:19:29 +01:00
Guillaume Dupuy
a6f541aad2 Cleanup
--HG--
branch : item_group
2017-03-16 11:36:24 +01:00
Guillaume Dupuy
27b7131e22 Fix compilation under windows
--HG--
branch : item_group
2017-03-16 00:59:53 +01:00
Guillaume Dupuy
11eeafc12d Support unlimited number of items group (and in a clean way)
--HG--
branch : item_group
2017-03-16 00:58:32 +01:00
80b032e703 Revert "mise a jour de RC"
This reverts commit d526953811.
2017-03-15 20:43:10 +01:00
d526953811 mise a jour de RC 2017-03-15 20:29:34 +01:00
Nimetu
85cd5beced Merge with develop 2017-03-15 17:45:19 +02:00
Nimetu
327686c1ce Merge with develop
--HG--
branch : compatibility-develop
2017-03-15 17:45:19 +02:00
Nimetu
be591b2107 Changed: replace c++11 code
--HG--
branch : develop
2017-03-15 17:43:49 +02:00
Nimetu
5d827c967f Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
Nimetu
1f080ee8d9 Added: translations 2017-03-15 00:12:59 +02:00
Nimetu
34573de13b Added: translations
--HG--
branch : compatibility-develop
2017-03-15 00:12:59 +02:00
Nimetu
6adae34ad3 Merge with develop 2017-03-14 23:42:52 +02:00
Nimetu
88c81e8895 Merge with develop
--HG--
branch : compatibility-develop
2017-03-14 23:42:52 +02:00
Nuno Gon?alves
ad8724fff3 Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs 2017-03-14 18:11:55 +01:00
Nuno Gonçalves
70823d15a9 Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs
--HG--
branch : compatibility-develop
2017-03-14 18:11:55 +01:00
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