Commit graph

6986 commits

Author SHA1 Message Date
kervala
a829c31021 Added: Toolchain to compile OS X client under Linux using osxcross
--HG--
branch : develop
2017-04-11 17:28:32 +02:00
Guillaume Dupuy
a1fbc963a9 Avoid rollover in _RyzomDay for low values
--HG--
branch : save_deposit_state_v2
2017-04-10 01:56:44 +02:00
Nimetu
dda809d345 Changed: Remove map landmark limit
--HG--
branch : develop
2017-04-07 12:43:33 +03:00
Meelis Mägi
59cd6afdb5 Merged in Glorf/ryzomcore/item_group (pull request #148)
Use CREATE_TIME and SERIAL to identify items in item groups

--HG--
branch : develop
2017-04-07 19:59:09 +00:00
Guillaume Dupuy
55add3ad47 Fix 2 * 1 hands equip when you have a 2 hands equipped
--HG--
branch : item_group
2017-04-07 19:07:26 +02:00
Guillaume Dupuy
91932668c6 Use item create time / serial to identify them (migration code included)
--HG--
branch : item_group
2017-04-07 19:00:36 +02:00
Guillaume Dupuy
ccd8454d60 Add getter/setter for CREATE_TIME/SERIAL
--HG--
branch : item_group
2017-04-07 12:34:19 +02:00
Nuno Gonçalves
ae6b3e38a0 Changed: rollback fixes of Strict aliasing warnings
--HG--
branch : item_group
2017-04-07 02:46:08 +02:00
Nuno Gonçalves
de949a60a9 Added: CREATE_TIME and SERIAL properties to items in database.xml
--HG--
branch : item_group
2017-04-06 15:01:10 +02:00
Guillaume Dupuy
ad347d09c8 Merging develop
--HG--
branch : item_group
2017-04-07 11:28:41 +02:00
Guillaume Dupuy
cf3cf69c39 Don't fake invalid action if there is nothing to fake (no item equiped)
--HG--
branch : develop
2017-04-03 01:43:26 +02:00
Guillaume Dupuy
87b0a85fe6 Minor item group fixes :
* Slot properly saved for right/left hand (couldn't equip 1H sword + dagger before)
* Ingame macro edition for item group
* Use the correct index (db index and not item list index) to autoEquip an item
* non ascii characters (accentued characters and stuff like that) are now correctly displayed in interface / commands output

--HG--
branch : develop
2017-04-03 01:34:29 +02:00
Nimetu
b446df86f0 Changed: Remove dead code
--HG--
branch : develop
2017-03-31 20:43:43 +03:00
Nimetu
0236b3e4a4 Fixed: compiling server (fixes #303)
--HG--
branch : develop
2017-03-27 18:08:43 +03:00
Nimetu
4c6f79ed22 Fixed: missing stdpch.h (fixes #303)
--HG--
branch : develop
2017-03-27 17:35:20 +03:00
Nimetu
2eab033283 Fixed: Music player loading non-existing files into playlist.
--HG--
branch : develop
2017-03-25 15:00:43 +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
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
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
be591b2107 Changed: replace c++11 code
--HG--
branch : develop
2017-03-15 17:43:49 +02: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