Commit graph

7395 commits

Author SHA1 Message Date
Nimetu
71e4004dd0 Merge with develop
--HG--
branch : compatibility-develop
2017-03-23 18:30:08 +02:00
Meelis Mägi
86adf11579 Merged in Glorf/ryzomcore/item_group (pull request #144)
Item group support

--HG--
branch : develop
2017-03-23 16:11:15 +00:00
Guillaume Dupuy
850613ac7e Don't use a separate thread to fake invalid actions
--HG--
branch : item_group
2017-03-23 16:06:47 +01:00
Guillaume Dupuy
6e62b186d0 Fix style
--HG--
branch : item_group
2017-03-21 16:25:50 +01:00
Guillaume Dupuy
67877cb846 Forgot UI translation
--HG--
branch : compatibility-develop
2017-03-21 09:15:47 +01:00
Guillaume Dupuy
b0ad916c37 Added translations for item groups
--HG--
branch : compatibility-develop
2017-03-20 22:34:00 +01:00
Guillaume Dupuy
1122a4e806 Add translations
--HG--
branch : item_group
2017-03-20 21:50:02 +01:00
Guillaume Dupuy
3d53789e0f Remember the slot (right/left hand) for item that can we weared in two similar slots
--HG--
branch : item_group
2017-03-20 20:38:51 +01:00
Guillaume Dupuy
db3271289d Avoid crashing if interface file is not at the good version
--HG--
branch : item_group
2017-03-20 17:43:50 +01:00
Guillaume Dupuy
332a2b5a74 More verbose message, bad command usage now print a synopsis
--HG--
branch : item_group
2017-03-20 17:16:19 +01:00
Guillaume Dupuy
65ae5b4ad1 Add an option to remember item to remove when creating a group
--HG--
branch : item_group
2017-03-20 16:31:37 +01:00
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
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
34573de13b Added: translations
--HG--
branch : compatibility-develop
2017-03-15 00:12:59 +02:00
Nimetu
88c81e8895 Merge with develop
--HG--
branch : compatibility-develop
2017-03-14 23:42:52 +02: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
kervala
076a50e3fb Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool
--HG--
branch : develop
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
5b0b92710a Added: copy_to_clipboard action handler
--HG--
branch : develop
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
d7a797bf4a Changed: Ensure that menu resizes from child elements
--HG--
branch : develop
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
524f80c8a0 Fixed: Crash when trying to navigate to non-existing #anchor
--HG--
branch : develop
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
0f5ec6c0b4 Fixed: Windowed resolution resetting when closing from login/outgame views.
--HG--
branch : develop
2017-01-12 13:29:47 +02: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
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
a7ca4ec3b9 Changed: Minor change
--HG--
branch : develop
2017-01-10 14:07:06 +02: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