Nimetu
108759952e
Changed: Use http cache headers for image cache
...
--HG--
branch : develop
2017-04-20 21:19:51 +03:00
kervala
4a848b0771
Changed: Centralize Foundation framework search
...
--HG--
branch : develop
2017-04-21 11:04:09 +02:00
Guillaume Dupuy
9586e39ca4
Use stdpch.h instead for include
...
--HG--
branch : fix_compilation_windows
2017-04-19 09:53:27 +02:00
Guillaume Dupuy
5b3eed58ec
Fix server compilation under windows
...
--HG--
branch : fix_compilation_windows
2017-04-18 20:15:14 +02:00
Guillaume Dupuy
4952eeb585
Add default constructor for CDepositState
...
--HG--
branch : save_deposit_state_v2
2017-04-12 22:15:23 +02:00
Guillaume Dupuy
bd3a27778e
Save deposit state
...
--HG--
branch : save_deposit_state_v2
2017-04-12 20:02:11 +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
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
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
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
Nimetu
109725fc9e
Changed: Move dyn channel commands (/0, /1 ..) to commands.xml
...
--HG--
branch : develop
2017-01-11 15:12:06 +02:00
kervala
065d1dc84c
Changed: Minor change
...
--HG--
branch : develop
2017-01-01 22:40:22 +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
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
43195f71a5
Fixed: Servers compilation under Linux
...
--HG--
branch : develop
2016-12-21 15:18:26 +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
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
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
1e45f7bd45
Fixed: Truncated bubble texts
...
--HG--
branch : develop
2016-12-19 12:01:55 +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
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
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
kervala
3142a8d99f
Changed: Support VC++ 2013 DLLs
...
--HG--
branch : develop
2016-12-15 21:11:27 +01:00
kervala
d039598225
Fixed: Compilation
...
--HG--
branch : develop
2016-12-12 12:02:25 +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
71b5a1734e
Fixed: Compilation
...
--HG--
branch : develop
2016-12-11 12:42:06 +01:00
kervala
106c924f49
Fixed: Use std::vector instead of CUniquePtr for arrays
...
--HG--
branch : develop
2016-12-11 12:31:24 +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