Commit Graph

7614 Commits (805fb726ccd846c4287d5b19be6351eae38b7583)

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
Nimetu fcbdbd17b7 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 6c01ded28d Fixed: Redirect for image requests
--HG--
branch : develop
8 years ago
Riasan 28b4474ae4 Changed: Add a new gui window web_lua_action
--HG--
branch : develop
8 years ago
Nimetu bb3b7e8277 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 4f0717c58a Fixed: Image cookies
--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 5f8fc673d1 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 5e27fe01f1 Changed: Updated translations (mostly UTF-16 -> UTF-8 conversion and use of UNIX EOL)
--HG--
branch : compatibility-develop
8 years ago
Nimetu 082704210b Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu a47a481c7a Changed: Force max table width if requested.
--HG--
branch : develop
8 years ago
Nimetu bff8ed488e Changed: CGroupParagraph does not handle text with line-breaks
--HG--
branch : develop
8 years ago
Nimetu eb23a3b61c Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala f739ed9e62 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 532a81f5cb Changed: Don't use CSString
--HG--
branch : develop
8 years ago
kervala e94b06066f Fixed: LibXml must be initialized only once and xmlSetGenericErrorFunc set a global function (calling it for each instance of CIXml is a mistake)
--HG--
branch : develop
8 years ago
kervala d0a199d22d Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 21ca659c70 Changed: More information for osxcross
--HG--
branch : develop
8 years ago
kervala 4a848b0771 Changed: Centralize Foundation framework search
--HG--
branch : develop
8 years ago
kervala 8dca705f73 Fixed: Misc depends on Carbon under OS X
--HG--
branch : develop
8 years ago
Nimetu 108759952e Changed: Use http cache headers for image cache
--HG--
branch : develop
8 years ago
Nimetu 3d09dd2094 Changed: Save cookies from image request
--HG--
branch : develop
8 years ago
Nimetu 3d48368de6 Changed: Workaround for dancing trees under direct3d (issue #160)
--HG--
branch : develop
8 years ago
Nimetu b78e8541ef Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 72b37450b4 Changed: Use basic cache expire for web images
--HG--
branch : develop
8 years ago
kervala 90c1a21ba6 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala f23600cd30 Fixed: Compilation in 32 bits with GCC (patch provided by Alistair Leslie-Hughes, thanks a lot)
--HG--
branch : develop
8 years ago
kervala 0845ebb5bd Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Guillaume Dupuy 9586e39ca4 Use stdpch.h instead for include
--HG--
branch : fix_compilation_windows
8 years ago
Guillaume Dupuy 5b3eed58ec Fix server compilation under windows
--HG--
branch : fix_compilation_windows
8 years ago
Nimetu 8f5588e0ec Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 20c216ecda Added: Basic queue for curl downloads
--HG--
branch : develop
8 years ago
Nimetu 9e7258d96e Fixed: Crash on webig debug log
--HG--
branch : develop
8 years ago
Guillaume Dupuy 4952eeb585 Add default constructor for CDepositState
--HG--
branch : save_deposit_state_v2
8 years ago
Guillaume Dupuy bd3a27778e Save deposit state
--HG--
branch : save_deposit_state_v2
8 years ago
kervala 685bb9fb14 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala e5e2ccf45c Changed: Minor changes
--HG--
branch : develop
8 years ago
kervala a829c31021 Added: Toolchain to compile OS X client under Linux using osxcross
--HG--
branch : develop
8 years ago
Guillaume Dupuy a1fbc963a9 Avoid rollover in _RyzomDay for low values
--HG--
branch : save_deposit_state_v2
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 79e916f61d Changed: CREATE_TIME and SERIAL properties to items in EGS code
--HG--
branch : compatibility-develop
8 years ago
Nuno Gonçalves ae6b3e38a0 Changed: rollback fixes of Strict aliasing warnings
--HG--
branch : item_group
8 years ago
Nuno Gonçalves d33d0ffdc5 Changed: rollback fixes of Strict aliasing warnings
--HG--
branch : compatibility-develop
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 2939beddba Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 0236b3e4a4 Fixed: compiling server (fixes #303)
--HG--
branch : 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 67877cb846 Forgot UI translation
--HG--
branch : compatibility-develop
8 years ago
Guillaume Dupuy b0ad916c37 Added translations for item groups
--HG--
branch : compatibility-develop
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 34573de13b Added: translations
--HG--
branch : compatibility-develop
8 years ago
Nimetu 88c81e8895 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nuno Gonçalves 70823d15a9 Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs
--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 5c56eb400e Changed: Workaround for white/black textures on Intel GPU (issue #310)
--HG--
branch : develop
8 years ago
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
8 years ago
Guillaume Dupuy 431e2349d5 Fix build with macOS clang
--HG--
branch : fix_compilation_mac
8 years ago
Guillaume Dupuy d5080e07cb Fix compilation on mac (thanks Siela for the fixes !)
--HG--
branch : fix_compilation_mac
8 years ago
kervala 076a50e3fb Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool
--HG--
branch : develop
8 years ago
Nimetu cea9549cd8 Added: Clickable urls in chat text (issue 282)
--HG--
branch : develop
8 years ago
Nimetu 5b0b92710a Added: copy_to_clipboard action handler
--HG--
branch : develop
8 years ago
Nimetu 9d0a2556d0 Changed: Refactor CViewLink to be able to use custom action handlers
--HG--
branch : develop
8 years ago
Nimetu d7a797bf4a Changed: Ensure that menu resizes from child elements
--HG--
branch : develop
8 years ago
Nimetu 472ccb758a Fixed: Wrong size for list element
--HG--
branch : develop
8 years ago
Nimetu 524f80c8a0 Fixed: Crash when trying to navigate to non-existing #anchor
--HG--
branch : develop
8 years ago
Nimetu fa8e1d95db Changed: Improve cURL error message for failed requests
--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
Nimetu ab5aa5b2c4 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 3e95a8b89f Fixed: Client crash on bad PNG file from webig download.
--HG--
branch : develop
8 years ago
Nimetu a7ca4ec3b9 Changed: Minor change
--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 47ac7ddd94 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 9541e78219 Changed: Exit if line is truncated
--HG--
branch : develop
8 years ago
kervala 5af01c7e24 Fixed: Support for quads and any number of vertices for a face
--HG--
branch : develop
8 years ago
kervala 74558b9517 Changed: Allow to define output bitmap size
--HG--
branch : develop
8 years ago
kervala 0a86498c0f Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala ca5a4f6788 Changed: Use NLMISC::drawFullLine instead of NLMISC::drawLine for better render
--HG--
branch : develop
8 years ago
kervala 7fac9341ee Fixed: V coordinates are inverted
--HG--
branch : develop
8 years ago
kervala eb91466d3b Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala b55f659a12 Changed: Generate an UV map from a Wavefront OBJ file
--HG--
branch : develop
8 years ago
kervala 2dbbfd6598 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 147053404d Changed: Formatting
--HG--
branch : develop
8 years ago
kervala 6ed3213a1a Changed: Use _T and tStrToUtf8/utf8ToTStr macros
--HG--
branch : develop
8 years ago
kervala 88d345e857 Changed: Allow to parse HTML color format in CRGBA::stringToRGBA
--HG--
branch : develop
8 years ago
kervala 84618b4fbe Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala dde8fd723a Added: New tool textures_tool to produce diffuse, normal, specular, etc... textures from an UV template and seamless textures or colorize a texture with a color
--HG--
branch : develop
8 years ago
kervala 534630bdcc Changed: Implement CBitmap::setPixelColor
--HG--
branch : develop
8 years ago
kervala 1bd7e18ba7 Fixed: Loading of some JPEG variants
--HG--
branch : develop
8 years ago
kervala 065d1dc84c Changed: Minor change
--HG--
branch : 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 4514d1179b Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 6c09626fde Changed: Define new variables for VC++ 2015
--HG--
branch : develop
8 years ago
kervala 3efe3ab1c1 Changed: Use hg log -r . instead of hg tip to get last revision
--HG--
branch : develop
8 years ago
Nimetu 4e4985d647 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 3fbfa4743b Fixed: Wrong element width when using scaled texture.
--HG--
branch : develop
8 years ago
Nimetu 04e774dc37 Backed out changeset: c1085bbb3dae
--HG--
branch : develop
8 years ago
Nimetu b95fed61f2 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
Nimetu 254c7690f8 Fixed: Wrong element width when using scaled texture.
--HG--
branch : develop
8 years ago
kervala f069df82b3 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 43195f71a5 Fixed: Servers compilation under Linux
--HG--
branch : develop
8 years ago
kervala 03ad7b63d4 Fixed: cpptest is using std::auto_ptr
--HG--
branch : 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 798fde40f6 Fixed: Recursive call
--HG--
branch : develop
8 years ago
kervala 3defbbbc89 Changed: Don't change x or y in these cases
--HG--
branch : develop
8 years ago
kervala e2f776d21e Fixed: Memory leak
--HG--
branch : develop
8 years ago
kervala 6570b26297 Fixed: Virtual methods with different parameters
--HG--
branch : develop
8 years ago
kervala 07606ffd77 Fixed: done() is a method of QDialog
--HG--
branch : develop
8 years ago
kervala c178730b80 Fixed: Virtual method with different parameters warning
--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 f921040f80 Fixed: Use a string (default was a bool)
--HG--
branch : develop
8 years ago
kervala 408dbb64f6 Fixed: Uninitialized variable
--HG--
branch : develop
8 years ago
kervala 8db7d75e7e Fixed: Uninitialized variables
--HG--
branch : develop
8 years ago
kervala e29fa9a719 Changed: Display line numbers instead of a pointer
--HG--
branch : develop
8 years ago
kervala 929cf93b87 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 89347cd6a0 Changed: Unicode
--HG--
branch : develop
8 years ago
kervala 6978dc9bee Changed: Use std::string instead of const char*
--HG--
branch : develop
8 years ago
kervala 0a4ce7e4e1 Changed: Unicode
--HG--
branch : develop
8 years ago
kervala cbb1233ce2 Changed: Minor changes
--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 0328f16c6c Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 61b76ad106 Changed: Minor changes
--HG--
branch : develop
8 years ago
kervala bd13cabb13 Fixed: Wrong argument checked
--HG--
branch : develop
8 years ago
kervala ede5a5a53b Fixed: Servers compilation
--HG--
branch : develop
8 years ago
kervala c8bc57d0a4 Merge with develop
--HG--
branch : compatibility-develop
8 years ago
kervala 148c748d31 Fixed: Compilation
--HG--
branch : develop
8 years ago
kervala 0668ff8f04 Changed: Minor changes
--HG--
branch : 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 c458084b59 Fixed: Unicode MFC use
--HG--
branch : develop
8 years ago
kervala a0b4bb2397 Changed: Strings initialization
--HG--
branch : develop
8 years ago
kervala cbf407f9a1 Changed: Replaced comparisons with string("") by empty() check
--HG--
branch : develop
8 years ago
kervala 4d6e569f98 Changed: Use NLMISC::toString instead of sprintf
--HG--
branch : develop
8 years ago
kervala 6ac49adb8b Fixed: Warning when generating DLU
--HG--
branch : develop
8 years ago
kervala 1ed5dcdda9 Changed: Use %u instead of %d for uint
--HG--
branch : develop
8 years ago
kervala 32fbf8163d Fixed: Compilation
--HG--
branch : develop
8 years ago
kervala b52daf9519 Fixed: Unicode MFC use
--HG--
branch : develop
8 years ago
kervala c4d8565185 Changed: Make 2 different upgd_nl.bat depending on compiler
--HG--
branch : develop
8 years ago