kervala
cb55615659
Merge with develop
...
--HG--
branch : compatibility-develop
2017-06-20 12:31:31 +02:00
kervala
de8a6ba1b5
Fixed: Warnings with clang
...
--HG--
branch : develop
2017-06-20 12:28:46 +02:00
Nimetu
2b7dac4450
Merge with develop
...
--HG--
branch : compatibility-develop
2017-06-08 22:38:03 +03:00
Nimetu
e956f69691
Changed: Enable fps view on game config window
...
--HG--
branch : develop
2017-06-08 22:37:19 +03: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
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
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
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
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