Commit Graph

1714 Commits (016f9dae359fb83ae56cec08540a4cb597473ffb)

Author SHA1 Message Date
Guillaume Dupuy 7e1556520f Fix an issue where item in groups could not be moved
Multiple group move would result in some item beeing incorrectly marked as equipped

--HG--
branch : fix_item_group
8 years ago
Riasan 9d01b4dfd8 Merge: with develop
--HG--
branch : compatibility-develop
8 years ago
Riasan 28b4474ae4 Changed: Add a new gui window web_lua_action
--HG--
branch : develop
8 years ago
Nimetu b8a3405ad7 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 3752884a91 Changed: Add next weather tooltip to ingame map
--HG--
branch : develop
8 years ago
Nimetu 753d9efccb Changed: Add humidity to ingame map
--HG--
branch : develop
8 years ago
Nimetu e06f8b0976 Changed: Add minutes to ingame map
--HG--
branch : develop
8 years ago
Nimetu eb23a3b61c Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala d0a199d22d Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 4a848b0771 Changed: Centralize Foundation framework search
--HG--
branch : develop
8 years ago
Nimetu 108759952e Changed: Use http cache headers for image cache
--HG--
branch : develop
8 years ago
Nimetu aa4f7ff697 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu dda809d345 Changed: Remove map landmark limit
--HG--
branch : develop
8 years ago
Guillaume Dupuy 55add3ad47 Fix 2 * 1 hands equip when you have a 2 hands equipped
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 91932668c6 Use item create time / serial to identify them (migration code included)
--HG--
branch : item_group
8 years ago
Guillaume Dupuy ccd8454d60 Add getter/setter for CREATE_TIME/SERIAL
--HG--
branch : item_group
8 years ago
Nuno Gonçalves de949a60a9 Added: CREATE_TIME and SERIAL properties to items in database.xml
--HG--
branch : item_group
8 years ago
Nuno Gonçalves bc8ae1ed07 Added: CREATE_TIME and SERIAL properties to items in database.xml
--HG--
branch : items_id
8 years ago
Guillaume Dupuy cf3cf69c39 Don't fake invalid action if there is nothing to fake (no item equiped)
--HG--
branch : develop
8 years ago
Guillaume Dupuy ea7119bead Don't fake invalid action if there is nothing to fake (no item equiped)
--HG--
branch : compatibility-develop
8 years ago
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
8 years ago
Guillaume Dupuy 79636f393d 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 : compatibility-develop
8 years ago
Nimetu 624a0c867b Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu b446df86f0 Changed: Remove dead code
--HG--
branch : develop
8 years ago
Nuno Gonçalves 37990da5f5 Changed: Fix crash on Scenographic Editor
--HG--
branch : compatibility-develop
8 years ago
Nimetu b54155f690 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 4c6f79ed22 Fixed: missing stdpch.h (fixes #303)
--HG--
branch : develop
8 years ago
Nimetu 946b509700 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 2eab033283 Fixed: Music player loading non-existing files into playlist.
--HG--
branch : develop
8 years ago
Nimetu 71e4004dd0 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Meelis Mägi 86adf11579 Merged in Glorf/ryzomcore/item_group (pull request #144)
Item group support

--HG--
branch : develop
8 years ago
Guillaume Dupuy 850613ac7e Don't use a separate thread to fake invalid actions
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 6e62b186d0 Fix style
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 1122a4e806 Add translations
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 3d53789e0f Remember the slot (right/left hand) for item that can we weared in two similar slots
--HG--
branch : item_group
8 years ago
Guillaume Dupuy db3271289d Avoid crashing if interface file is not at the good version
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 332a2b5a74 More verbose message, bad command usage now print a synopsis
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 65ae5b4ad1 Add an option to remember item to remove when creating a group
--HG--
branch : item_group
8 years ago
Nimetu f52abb2933 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu c247b43a9b Changed: Fix ingame keys list
--HG--
branch : develop
8 years ago
Guillaume Dupuy f222d1736a Fix uninit/release
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 6af0fd168c Use SLOT_EQUIPEMENT instead of SLOTTYPE
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 08306e6a69 Minor fixes
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 1d36ea9acc Minor interface fixes
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 83dea32f41 Add support for removing items before equipping an item group
--HG--
branch : item_group
8 years ago
Guillaume Dupuy a6f541aad2 Cleanup
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 27b7131e22 Fix compilation under windows
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 11eeafc12d Support unlimited number of items group (and in a clean way)
--HG--
branch : item_group
8 years ago
Nimetu 327686c1ce Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu be591b2107 Changed: replace c++11 code
--HG--
branch : develop
8 years ago
Nimetu 88c81e8895 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Guillaume Dupuy c2049935a4 Support for an item beeing in multiple groups
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 5dcc7932ff Forgot a return
--HG--
branch : item_group
8 years ago
Guillaume Dupuy d4b2e64c21 Fix compilation
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 8880c37fb2 Remove C++11 features
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 54ff3a88d5 Fix a crash
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 6c9bbb8c0b Allow support for room / guild movement
--HG--
branch : item_group
8 years ago
Guillaume Dupuy ecf2ac530c Remove usePrice from xml, it's now used if minPrice or maxPrice are not default value
--HG--
branch : item_group
8 years ago
Guillaume Dupuy 9fffec8ef1 Added interface for item groups
--HG--
branch : item_group
8 years ago
Guillaume Dupuy fdbc261a7e First working prototype of itemgroups
--HG--
branch : item_group
8 years ago
Nimetu cea9549cd8 Added: Clickable urls in chat text (issue 282)
--HG--
branch : develop
8 years ago
Nimetu 0f5ec6c0b4 Fixed: Windowed resolution resetting when closing from login/outgame views.
--HG--
branch : develop
8 years ago
ulukyn@gmail.com c43627159c Fixed: Scenographic Editor lua issues
--HG--
branch : compatibility-develop
8 years ago
Nimetu 109725fc9e Changed: Move dyn channel commands (/0, /1 ..) to commands.xml
--HG--
branch : develop
8 years ago
ulukyn@gmail.com 8dce467417 Fixed: Scenographic Editor crash the client (revert bad commit of actions.h)
--HG--
branch : compatibility-develop
8 years ago
ulukyn@gmail.com 56c4674d10 Fixed: Scenographic Editor crash the client
--HG--
branch : compatibility-develop
8 years ago
kervala cdd1250066 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 1bb75d8956 Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase)
--HG--
branch : develop
8 years ago
kervala c91cd27a25 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 66fcc5081a Changed: Temporary comment Lua functions registration (crash when reselect characters)
--HG--
branch : develop
8 years ago
kervala 3265749bfe Changed: Don't need to release twice CEditor
--HG--
branch : develop
8 years ago
kervala 48734b6d2f Changed: Minor change
--HG--
branch : develop
8 years ago
kervala d8ffb10df8 Changed: Use a global C64BitsParts union to avoid strict aliasing warnings
--HG--
branch : develop
8 years ago
kervala 6927bb5849 Fixed: Steam latest client API changes
--HG--
branch : compatibility-develop
8 years ago
kervala 8884a8fcb1 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 1b1e08b7f6 Changed: Warnings
--HG--
branch : develop
8 years ago
kervala 6570b26297 Fixed: Virtual methods with different parameters
--HG--
branch : develop
8 years ago
kervala b04451c473 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 4e0a19205c Changed: Check return value of fwrite
--HG--
branch : develop
8 years ago
kervala 7aabc217b0 Fixed: Compilation under Linux
--HG--
branch : develop
8 years ago
kervala db9fbd2746 Fixed: Strict aliasing warnings
--HG--
branch : develop
8 years ago
kervala 8db7d75e7e Fixed: Uninitialized variables
--HG--
branch : develop
8 years ago
kervala 929cf93b87 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 6978dc9bee Changed: Use std::string instead of const char*
--HG--
branch : develop
8 years ago
kervala e186c7796b Changed: New DEV command to display a bubble with a long text
--HG--
branch : develop
8 years ago
kervala 31a540b35d Changed: Replace size() comparisons by empty() ones
--HG--
branch : develop
8 years ago
kervala 89318ea69d Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 1e45f7bd45 Fixed: Truncated bubble texts
--HG--
branch : develop
8 years ago
kervala c8bc57d0a4 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 8da20b30cc Changed: Merged changes from compatibility-develop that should also be in develop
--HG--
branch : develop
8 years ago
kervala 4e99767ae2 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 1ed5dcdda9 Changed: Use %u instead of %d for uint
--HG--
branch : develop
8 years ago
kervala c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler
--HG--
branch : develop
8 years ago
kervala cbf2c744f0 Changed: Replace some const char* by std::string
--HG--
branch : develop
8 years ago
kervala 81008cd9ff Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 3142a8d99f Changed: Support VC++ 2013 DLLs
--HG--
branch : develop
8 years ago
ulukyn@gmail.com 3f58cbd077 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
8 years ago
ulukyn@gmail.com b0dc979718 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
8 years ago
ulukyn@gmail.com 6238139c08 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
8 years ago
ulukyn@gmail.com 6ff3cc9d77 Added: sceneedit.lua and json.lua used by Scenographic Editor
--HG--
branch : compatibility-develop
8 years ago