kervala
91b126a33a
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-20 11:40:09 +02:00
kervala
a730890d4c
Added: Support for Jessie
...
--HG--
branch : develop
2017-04-20 11:39:21 +02:00
kervala
44fa42a6b5
Fixed: Yakkety and Zesty are using libpng-dev now
...
--HG--
branch : develop
2017-04-20 11:38:40 +02:00
kervala
0845ebb5bd
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-20 09:11:30 +02:00
Cédric OCHS
a792bcacf4
Merged in Glorf/ryzomcore/fix_compilation_windows (pull request #151 )
...
Fix server compilation under windows, with vc12
Approved-by: Cédric OCHS <kervala@gmail.com>
--HG--
branch : develop
2017-04-19 08:00:42 +00: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
kervala
c6403a1a34
Fixed: Use "revision" file
...
--HG--
branch : develop
2017-04-18 10:57:53 +02:00
kervala
84f733c8d4
Changed: Updated supported Ubuntu versions
...
--HG--
branch : develop
2017-04-18 10:57:24 +02:00
Nimetu
8f5588e0ec
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-16 22:45:39 +03:00
Nimetu
20c216ecda
Added: Basic queue for curl downloads
...
--HG--
branch : develop
2017-04-16 22:01:44 +03:00
Nimetu
9e7258d96e
Fixed: Crash on webig debug log
...
--HG--
branch : develop
2017-04-16 21:56:12 +03:00
Meelis Mägi
1348304715
Merged in Glorf/ryzomcore/save_deposit_state_v2 (pull request #150 )
...
Save deposit state
--HG--
branch : develop
2017-04-13 12:35:37 +00: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
kervala
685bb9fb14
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-11 17:29:56 +02:00
kervala
e5e2ccf45c
Changed: Minor changes
...
--HG--
branch : develop
2017-04-11 17:29:09 +02:00
kervala
a829c31021
Added: Toolchain to compile OS X client under Linux using osxcross
...
--HG--
branch : develop
2017-04-11 17:28:32 +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
aa4f7ff697
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-09 17:38:29 +03:00
Nimetu
dda809d345
Changed: Remove map landmark limit
...
--HG--
branch : develop
2017-04-07 12:43:33 +03:00
Meelis Mägi
59cd6afdb5
Merged in Glorf/ryzomcore/item_group (pull request #148 )
...
Use CREATE_TIME and SERIAL to identify items in item groups
--HG--
branch : develop
2017-04-07 19:59:09 +00: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
79e916f61d
Changed: CREATE_TIME and SERIAL properties to items in EGS code
...
--HG--
branch : compatibility-develop
2017-04-07 02:49:12 +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
d33d0ffdc5
Changed: rollback fixes of Strict aliasing warnings
...
--HG--
branch : compatibility-develop
2017-04-07 02:46:08 +02:00
Nuno Gonçalves
b40d52a5b1
Merge from items_id branch
...
--HG--
branch : compatibility-develop
2017-04-06 15:02:09 +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
ad347d09c8
Merging develop
...
--HG--
branch : item_group
2017-04-07 11:28:41 +02:00
Nuno Gonçalves
bc8ae1ed07
Added: CREATE_TIME and SERIAL properties to items in database.xml
...
--HG--
branch : items_id
2017-04-06 15:01:10 +02:00
Nimetu
1f948211b8
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-03 15:17:37 +03: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
ea7119bead
Don't fake invalid action if there is nothing to fake (no item equiped)
...
--HG--
branch : compatibility-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
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
2939beddba
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-27 18:09:05 +03:00
Nimetu
0236b3e4a4
Fixed: compiling server ( fixes #303 )
...
--HG--
branch : develop
2017-03-27 18:08:43 +03: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