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
2017-04-03 01:34:29 +02:00
Nimetu
624a0c867b
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-31 20:48:03 +03:00
Nimetu
b446df86f0
Changed: Remove dead code
...
--HG--
branch : develop
2017-03-31 20:43:43 +03:00
Nuno Gonçalves
37990da5f5
Changed: Fix crash on Scenographic Editor
...
--HG--
branch : compatibility-develop
2017-03-29 13:38:22 +02:00
Nimetu
b54155f690
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-27 17:37:39 +03:00
Nimetu
4c6f79ed22
Fixed: missing stdpch.h ( fixes #303 )
...
--HG--
branch : develop
2017-03-27 17:35:20 +03:00
Nimetu
946b509700
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-25 15:01:22 +02:00
Nimetu
2eab033283
Fixed: Music player loading non-existing files into playlist.
...
--HG--
branch : develop
2017-03-25 15:00:43 +02:00
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
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
88c81e8895
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-14 23:42:52 +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
Nimetu
cea9549cd8
Added: Clickable urls in chat text (issue 282)
...
--HG--
branch : develop
2017-01-21 13:29:34 +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
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
ulukyn@gmail.com
56c4674d10
Fixed: Scenographic Editor crash the client
...
--HG--
branch : compatibility-develop
2017-01-10 12:32:44 +01:00
kervala
cdd1250066
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-31 15:16:40 +01:00
kervala
1bb75d8956
Fixed: Bug with C++11 under Linux with clang (an iterator is invalidated after an erase)
...
--HG--
branch : develop
2016-12-31 15:16:09 +01:00
kervala
c91cd27a25
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-24 14:24:44 +01:00
kervala
66fcc5081a
Changed: Temporary comment Lua functions registration (crash when reselect characters)
...
--HG--
branch : develop
2016-12-24 14:02:33 +01:00
kervala
3265749bfe
Changed: Don't need to release twice CEditor
...
--HG--
branch : develop
2016-12-24 14:01:51 +01:00
kervala
48734b6d2f
Changed: Minor change
...
--HG--
branch : develop
2016-12-24 14:01:35 +01:00
kervala
d8ffb10df8
Changed: Use a global C64BitsParts union to avoid strict aliasing warnings
...
--HG--
branch : develop
2016-12-24 14:01:21 +01:00
kervala
6927bb5849
Fixed: Steam latest client API changes
...
--HG--
branch : compatibility-develop
2016-12-23 13:49:49 +01:00
kervala
8884a8fcb1
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-19 17:48:07 +01:00
kervala
1b1e08b7f6
Changed: Warnings
...
--HG--
branch : develop
2016-12-19 17:47:15 +01:00
kervala
6570b26297
Fixed: Virtual methods with different parameters
...
--HG--
branch : develop
2016-12-19 17:46:07 +01:00
kervala
b04451c473
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-19 15:58:48 +01:00
kervala
4e0a19205c
Changed: Check return value of fwrite
...
--HG--
branch : develop
2016-12-19 15:50:54 +01:00
kervala
7aabc217b0
Fixed: Compilation under Linux
...
--HG--
branch : develop
2016-12-19 15:50:21 +01:00
kervala
db9fbd2746
Fixed: Strict aliasing warnings
...
--HG--
branch : develop
2016-12-19 15:49:50 +01:00
kervala
8db7d75e7e
Fixed: Uninitialized variables
...
--HG--
branch : develop
2016-12-19 15:43:38 +01:00
kervala
929cf93b87
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-19 13:58:14 +01:00
kervala
6978dc9bee
Changed: Use std::string instead of const char*
...
--HG--
branch : develop
2016-12-19 13:33:24 +01:00
kervala
e186c7796b
Changed: New DEV command to display a bubble with a long text
...
--HG--
branch : develop
2016-12-19 13:16:27 +01:00
kervala
31a540b35d
Changed: Replace size() comparisons by empty() ones
...
--HG--
branch : develop
2016-12-19 13:15:25 +01:00
kervala
89318ea69d
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-19 12:02:47 +01:00
kervala
1e45f7bd45
Fixed: Truncated bubble texts
...
--HG--
branch : develop
2016-12-19 12:01:55 +01:00
kervala
c8bc57d0a4
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-18 20:44:33 +01:00
kervala
8da20b30cc
Changed: Merged changes from compatibility-develop that should also be in develop
...
--HG--
branch : develop
2016-12-18 20:39:16 +01:00
kervala
4e99767ae2
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-18 14:47:16 +01:00
kervala
1ed5dcdda9
Changed: Use %u instead of %d for uint
...
--HG--
branch : develop
2016-12-18 14:00:20 +01:00
kervala
c4d8565185
Changed: Make 2 different upgd_nl.bat depending on compiler
...
--HG--
branch : develop
2016-12-18 13:58:20 +01:00
kervala
cbf2c744f0
Changed: Replace some const char* by std::string
...
--HG--
branch : develop
2016-12-18 13:45:07 +01:00
kervala
81008cd9ff
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-15 21:12:19 +01:00
kervala
3142a8d99f
Changed: Support VC++ 2013 DLLs
...
--HG--
branch : develop
2016-12-15 21:11:27 +01:00
ulukyn@gmail.com
3f58cbd077
Fixed: Load Scenographic Editor lua files
...
--HG--
branch : compatibility-develop
2016-12-14 22:24:49 +01:00
ulukyn@gmail.com
b0dc979718
Fixed: Load Scenographic Editor lua files
...
--HG--
branch : compatibility-develop
2016-12-14 20:16:42 +01:00
ulukyn@gmail.com
6238139c08
Fixed: Load Scenographic Editor lua files
...
--HG--
branch : compatibility-develop
2016-12-14 16:14:33 +01:00
ulukyn@gmail.com
6ff3cc9d77
Added: sceneedit.lua and json.lua used by Scenographic Editor
...
--HG--
branch : compatibility-develop
2016-12-14 13:36:59 +01:00
ulukyn@gmail.com
c6f10d493d
Fixed: updateVector don't need return a boolean
...
--HG--
branch : compatibility-develop
2016-12-13 23:42:02 +01:00
ulukyn@gmail.com
68e6dbaf9a
Fusion
...
--HG--
branch : compatibility-develop
2016-12-13 21:16:30 +01:00
ulukyn@gmail.com
80fc274813
Fixed: Removing some nlinfo and correction getMouseRightDown
...
--HG--
branch : compatibility-develop
2016-12-13 21:08:33 +01:00
kervala
2b53cc82aa
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-11 14:25:19 +01:00
kervala
bd8cdb46e0
Fixed: Wrong indent
...
--HG--
branch : develop
2016-12-11 14:21:28 +01:00
kervala
e7d1710747
Chnged: Sign comparison warning
...
--HG--
branch : develop
2016-12-11 14:20:52 +01:00
kervala
c240c45514
Changed: Removed unused variables
...
--HG--
branch : develop
2016-12-11 14:20:31 +01:00
kervala
035a267e92
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-11 12:43:05 +01:00
kervala
71b5a1734e
Fixed: Compilation
...
--HG--
branch : develop
2016-12-11 12:42:06 +01:00
kervala
ac404a2c8f
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-11 12:32:05 +01:00
kervala
106c924f49
Fixed: Use std::vector instead of CUniquePtr for arrays
...
--HG--
branch : develop
2016-12-11 12:31:24 +01:00
ulukyn@gmail.com
1a4c020e56
Added: ARKPACSBorders to enable/disable the display of collisions by user
...
--HG--
branch : compatibility-develop
2016-12-10 22:05:38 +01:00
ulukyn@gmail.com
9e73cd8d22
Added: Export usefull cursor and shape functions in lua:
...
getGroundAtMouse
getMousePos
getMouseDown
getMouseMiddleDown
getMouseRightDown
setMouseCursor
setupShape
getShapeIdAt
addShape
moveShape
rotateShape
getShapePos
getShapeScale
getShapeRot
getShapeColPos
getShapeColScale
getShapeColOrient
deleteShape
--HG--
branch : compatibility-develop
2016-12-10 22:04:33 +01:00
kervala
f085121937
Merge with develop
...
--HG--
branch : compatibility-develop
2016-12-10 19:52:43 +01:00
kervala
faecd5b952
Changed: extern keyword useless there
...
--HG--
branch : develop
2016-12-10 19:02:06 +01:00
kervala
d37a1e032c
Fixed: Don't call CCoTask::releaseInstance() because allocated on heap
...
--HG--
branch : develop
2016-12-10 19:01:34 +01:00
kervala
9a6b3c91b7
Changed: Minor changes
...
--HG--
branch : develop
2016-12-10 18:58:13 +01:00
kervala
934df9bd6f
Changed: Already a std::string
...
--HG--
branch : develop
2016-12-10 13:09:16 +01:00
kervala
ab44d7e809
Changed: Use a CUniquePtr macro since std::unique_ptr doesn't exist on all (yet) supported platforms
...
--HG--
branch : develop
2016-12-10 12:05:29 +01:00
kervala
0f6ae5e239
Changed: Release all memory when leaving in login screen
...
--HG--
branch : develop
2016-12-09 16:15:18 +01:00
kervala
eabfcbf708
Fixed: Release CCurrentCoTask singleton
...
--HG--
branch : develop
2016-12-09 16:14:16 +01:00