Nimetu
087958eb6c
Merge with develop
...
--HG--
branch : compatibility-develop
2017-06-01 14:06:04 +03:00
kishan_grimout
5ea48c7599
fix crash in EGS when client asks to create an item with a sheet ID EGS doesn't know
...
by avoiding access the null item pointer outside the if(null) scope.
--HG--
branch : develop
2017-05-29 16:15:02 +02:00
Riasan
1760d16dd2
Fix: Typo by forceCameraFirstPerson
...
--HG--
branch : compatibility-develop
2017-05-23 21:59:28 +02:00
Riasan
8b4d189c31
Changed: edit force_camera_fp command
...
--HG--
branch : develop
2017-05-23 19:38:26 +02:00
Riasan
2dbcb978a4
Changed: edit force_camera_fp command
...
--HG--
branch : compatibility-develop
2017-05-23 19:38:26 +02:00
Riasan
6fb823a9be
Merge with develop
...
--HG--
branch : compatibility-develop
2017-05-23 18:27:52 +02:00
Riasan
319cab93cd
Fixed: force_camera_fp command
...
--HG--
branch : develop
2017-05-23 18:24:49 +02:00
Riasan
18823c28fa
Changed: Add new lua command force_camera_fp to force camarea to first person view
...
--HG--
branch : develop
2017-05-22 19:50:47 +02:00
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
2017-05-21 19:32:08 +02:00
Riasan
9d01b4dfd8
Merge: with develop
...
--HG--
branch : compatibility-develop
2017-05-14 19:07:54 +02:00
Riasan
28b4474ae4
Changed: Add a new gui window web_lua_action
...
--HG--
branch : develop
2017-05-12 19:29:10 +02:00
Nimetu
b8a3405ad7
Merge with develop
...
--HG--
branch : compatibility-develop
2017-05-03 20:53:28 +03:00
Nimetu
3752884a91
Changed: Add next weather tooltip to ingame map
...
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
753d9efccb
Changed: Add humidity to ingame map
...
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
e06f8b0976
Changed: Add minutes to ingame map
...
--HG--
branch : develop
2017-05-03 20:52:02 +03:00
Nimetu
5f8fc673d1
Merge with develop
...
--HG--
branch : compatibility-develop
2017-05-01 13:18:58 +03:00
kervala
5e27fe01f1
Changed: Updated translations (mostly UTF-16 -> UTF-8 conversion and use of UNIX EOL)
...
--HG--
branch : compatibility-develop
2017-04-28 13:05:25 +02:00
Nimetu
eb23a3b61c
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-25 00:23:09 +03:00
kervala
d0a199d22d
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-21 11:06:24 +02:00
kervala
4a848b0771
Changed: Centralize Foundation framework search
...
--HG--
branch : develop
2017-04-21 11:04:09 +02:00
Nimetu
108759952e
Changed: Use http cache headers for image cache
...
--HG--
branch : develop
2017-04-20 21:19:51 +03:00
kervala
0845ebb5bd
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-20 09:11:30 +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
Nimetu
8f5588e0ec
Merge with develop
...
--HG--
branch : compatibility-develop
2017-04-16 22:45:39 +03: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
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
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
de949a60a9
Added: CREATE_TIME and SERIAL properties to items in database.xml
...
--HG--
branch : item_group
2017-04-06 15:01:10 +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
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