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 |
|
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
|
84618b4fbe
|
Merge with develop
--HG--
branch : compatibility-develop
|
2017-01-01 22:45:29 +01:00 |
|
kervala
|
065d1dc84c
|
Changed: Minor change
--HG--
branch : develop
|
2017-01-01 22:40:22 +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
|
f069df82b3
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-21 15:18:59 +01:00 |
|
kervala
|
43195f71a5
|
Fixed: Servers compilation under Linux
--HG--
branch : develop
|
2016-12-21 15:18:26 +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
|
07606ffd77
|
Fixed: done() is a method of QDialog
--HG--
branch : develop
|
2016-12-19 17:43:47 +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
|
408dbb64f6
|
Fixed: Uninitialized variable
--HG--
branch : develop
|
2016-12-19 15:44:08 +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
|
89347cd6a0
|
Changed: Unicode
--HG--
branch : develop
|
2016-12-19 13:33:44 +01:00 |
|
kervala
|
6978dc9bee
|
Changed: Use std::string instead of const char*
--HG--
branch : develop
|
2016-12-19 13:33:24 +01:00 |
|
kervala
|
0a4ce7e4e1
|
Changed: Unicode
--HG--
branch : develop
|
2016-12-19 13:17:07 +01:00 |
|
kervala
|
cbb1233ce2
|
Changed: Minor changes
--HG--
branch : develop
|
2016-12-19 13:16:48 +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
|
0328f16c6c
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-19 09:27:18 +01:00 |
|
kervala
|
61b76ad106
|
Changed: Minor changes
--HG--
branch : develop
|
2016-12-19 09:26:46 +01:00 |
|
kervala
|
bd13cabb13
|
Fixed: Wrong argument checked
--HG--
branch : develop
|
2016-12-19 09:26:28 +01:00 |
|
kervala
|
ede5a5a53b
|
Fixed: Servers compilation
--HG--
branch : develop
|
2016-12-19 09:25:51 +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
|
a0b4bb2397
|
Changed: Strings initialization
--HG--
branch : develop
|
2016-12-18 14:41:47 +01:00 |
|
kervala
|
cbf407f9a1
|
Changed: Replaced comparisons with string("") by empty() check
--HG--
branch : develop
|
2016-12-18 14:40:54 +01:00 |
|
kervala
|
1ed5dcdda9
|
Changed: Use %u instead of %d for uint
--HG--
branch : develop
|
2016-12-18 14:00:20 +01:00 |
|
kervala
|
32fbf8163d
|
Fixed: Compilation
--HG--
branch : develop
|
2016-12-18 13:59:17 +01:00 |
|
kervala
|
b52daf9519
|
Fixed: Unicode MFC use
--HG--
branch : develop
|
2016-12-18 13:59:02 +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 |
|
Guillaume Dupuy
|
73191a2388
|
Remove duplicate code
--HG--
branch : fix_freezing
|
2016-12-17 14:31:27 +01:00 |
|
Guillaume Dupuy
|
fb280101f1
|
Fix a bug where a monster could be stuck after dropping aggro while rooted
--HG--
branch : fix_freezing
|
2016-12-17 02:47:05 +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
|
afe3863f0f
|
Merge with develop
--HG--
branch : compatibility-develop
|
2016-12-12 12:03:15 +01:00 |
|
kervala
|
d039598225
|
Fixed: Compilation
--HG--
branch : develop
|
2016-12-12 12:02:25 +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
|
bbcd14cecb
|
Removed: Empty cpp files
--HG--
branch : develop
|
2016-12-10 18:40:17 +01:00 |
|
kervala
|
fe72e1c8d3
|
Fixed: Compilation of World Editor in Unicode
--HG--
branch : develop
|
2016-12-10 18:15:01 +01:00 |
|
kervala
|
94bf8fd54e
|
Changed: Use TCHAR functions
--HG--
branch : develop
|
2016-12-10 14:21:20 +01:00 |
|
kervala
|
934df9bd6f
|
Changed: Already a std::string
--HG--
branch : develop
|
2016-12-10 13:09:16 +01:00 |
|
kervala
|
699680ac4a
|
Changed: Use addSlashR to replace \n by \r\n
--HG--
branch : develop
|
2016-12-10 13:08:39 +01:00 |
|
kervala
|
5dfa19518a
|
Changed: NeL helpers to launch an external editor
--HG--
branch : develop
|
2016-12-10 13:02:26 +01:00 |
|
kervala
|
5658cad02e
|
Changed: Convert std::string <> TCHAR
--HG--
branch : develop
|
2016-12-10 13:01:27 +01:00 |
|
kervala
|
dbba511ee7
|
Changed: Replace a lot of const char* by std::string parameters
--HG--
branch : develop
|
2016-12-10 12:30:57 +01:00 |
|