Commit graph

3077 commits

Author SHA1 Message Date
kervala
575f58d749 Changed: Synchonized some changes from compatibility-develop branch
--HG--
branch : develop
2017-10-01 15:27:31 +02:00
kervala
90359122d7 Changed: Other changes in CMake files
--HG--
branch : develop
2017-10-01 15:25:00 +02:00
kervala
8acaa65e04 Fixed: Compilation with OpenSSL 1.1.0
--HG--
branch : develop
2017-10-01 15:17:10 +02:00
kervala
630ae259ad Changed: Add Steam support in develop branch too
--HG--
branch : develop
2017-10-01 15:10:51 +02:00
kervala
2fad59f296 Changed: Added more memory leaks checks
--HG--
branch : develop
2017-10-01 15:08:31 +02:00
ulukyn@gmail.com
3c6dc5ea92 Added: loadBackground(string) lua function to change the texture of next teleport
--HG--
branch : develop
2017-08-22 23:23:00 +02:00
ulukyn@gmail.com
5797b2d64e Fixed: Resize collision when scale object/npc (using vpb)
--HG--
branch : develop
2017-08-22 23:22:06 +02:00
Nimetu
9390f9cca5 Changed: Sort tribe fame list
--HG--
branch : develop
2017-08-15 11:54:24 +03:00
Cédric OCHS
36f5ee7f83 Merged in Glorf/ryzomcore/fix_freespace_check (pull request #156)
Fix ignoreFreeDiskSpaceChecks() usage

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
2017-07-15 10:26:50 +00:00
Guillaume Dupuy
d163cde51e Fix ignoreFreeDiskSpaceChecks() usage
Now actually ignore free space, instead of creating an error and refusing to go further everytime

--HG--
branch : fix_freespace_check
2017-07-15 12:14:33 +02:00
kervala
524a3d6645 Fixed: Description of "delete profile" action (all files are really deleted)
--HG--
branch : develop
2017-07-13 22:53:20 +02:00
kervala
dac136d430 Fixed: Error 60 when creating an account under OS X
--HG--
branch : develop
2017-07-13 20:54:06 +02:00
Nimetu
c435f77201 Added: Quality range filter to inventory
--HG--
branch : develop
2017-07-12 23:45:56 +03:00
Nimetu
7350291a56 Added: Text search to inventory
--HG--
branch : develop
2017-07-12 21:19:40 +03:00
Nimetu
455a923031 Added: clear_on_escape property to edit box
--HG--
branch : develop
2017-07-12 20:32:42 +03:00
Nimetu
71d969c40b Changed: Keep track of HSTS header and rewrite http to https as needed
--HG--
branch : develop
2017-07-11 22:23:38 +03:00
Guillaume Dupuy
63138ba784 Use correct comparison between enum
Was previously (badly) relying on int as boolean behaviour
Solves a bug where remove slot was not working with headdress (value 0 in enum TSlotEquipment)

--HG--
branch : develop
2017-07-11 00:27:04 +02:00
Meelis Mägi
cdf648fd4f Merged in Glorf/ryzomcore/fix_item_group_08072017 (pull request #154)
Minor item group fixes :

--HG--
branch : develop
2017-07-08 19:20:02 +00:00
Guillaume Dupuy
bc17b5eb1a Don't add multiples identical items to a group
Solves the issue where 2 hand weapon were not properly equipped

--HG--
branch : fix_item_group_08072017
2017-07-08 14:55:18 +02:00
Guillaume Dupuy
59ce9437c8 Swap item serial and create time properties when swapping items
--HG--
branch : fix_item_group_08072017
2017-07-08 13:43:51 +02:00
Nimetu
368e1389f2 Fixed: Clean up dyn bubbles from chat/webig to prevent crash after character change.
--HG--
branch : develop
2017-07-03 21:54:35 +03:00
kervala
de8a6ba1b5 Fixed: Warnings with clang
--HG--
branch : develop
2017-06-20 12:28:46 +02:00
Nimetu
e956f69691 Changed: Enable fps view on game config window
--HG--
branch : develop
2017-06-08 22:37:19 +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
8b4d189c31 Changed: edit force_camera_fp command
--HG--
branch : develop
2017-05-23 19:38:26 +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
28b4474ae4 Changed: Add a new gui window web_lua_action
--HG--
branch : develop
2017-05-12 19:29:10 +02: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
Guillaume Dupuy
431e2349d5 Fix build with macOS clang
--HG--
branch : fix_compilation_mac
2017-04-28 23:58:16 +02:00
Guillaume Dupuy
d5080e07cb Fix compilation on mac (thanks Siela for the fixes !)
--HG--
branch : fix_compilation_mac
2017-04-28 23:56:06 +02:00
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