kervala
f23600cd30
Fixed: Compilation in 32 bits with GCC (patch provided by Alistair Leslie-Hughes, thanks a lot)
...
--HG--
branch : develop
2017-04-20 13:53:36 +02: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
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
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
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
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
67877cb846
Forgot UI translation
...
--HG--
branch : compatibility-develop
2017-03-21 09:15:47 +01:00
Guillaume Dupuy
b0ad916c37
Added translations for item groups
...
--HG--
branch : compatibility-develop
2017-03-20 22:34:00 +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
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
327686c1ce
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-15 17:45:19 +02:00
Nimetu
be591b2107
Changed: replace c++11 code
...
--HG--
branch : develop
2017-03-15 17:43:49 +02:00
Nimetu
34573de13b
Added: translations
...
--HG--
branch : compatibility-develop
2017-03-15 00:12:59 +02:00
Nimetu
88c81e8895
Merge with develop
...
--HG--
branch : compatibility-develop
2017-03-14 23:42:52 +02:00
Nuno Gonçalves
70823d15a9
Changed: comment nldebug on driver_openg_texture to prevent Gigabits of logs
...
--HG--
branch : compatibility-develop
2017-03-14 18:11:55 +01: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
5c56eb400e
Changed: Workaround for white/black textures on Intel GPU (issue #310 )
...
--HG--
branch : develop
2017-03-01 20:36:25 +02:00
Cédric OCHS
9bc910d102
Merged in Glorf/ryzomcore/fix_compilation_mac (pull request #152 )
...
Fix compilation (tools + server) on OSX
Approved-by: Cédric OCHS <kervala@gmail.com>
--HG--
branch : develop
2017-04-29 09:09:09 +00: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
kervala
076a50e3fb
Changed: Use modulateFromColorRGBOnly to colorize a bitmap in textures_tool
...
--HG--
branch : develop
2017-02-27 10:57:24 +01:00
Nimetu
cea9549cd8
Added: Clickable urls in chat text (issue 282)
...
--HG--
branch : develop
2017-01-21 13:29:34 +02:00
Nimetu
5b0b92710a
Added: copy_to_clipboard action handler
...
--HG--
branch : develop
2017-01-21 13:29:24 +02:00
Nimetu
9d0a2556d0
Changed: Refactor CViewLink to be able to use custom action handlers
...
--HG--
branch : develop
2017-01-21 13:29:20 +02:00
Nimetu
d7a797bf4a
Changed: Ensure that menu resizes from child elements
...
--HG--
branch : develop
2017-01-21 13:29:15 +02:00
Nimetu
472ccb758a
Fixed: Wrong size for list element
...
--HG--
branch : develop
2017-01-21 13:29:12 +02:00
Nimetu
524f80c8a0
Fixed: Crash when trying to navigate to non-existing #anchor
...
--HG--
branch : develop
2017-01-21 13:29:05 +02:00
Nimetu
fa8e1d95db
Changed: Improve cURL error message for failed requests
...
--HG--
branch : develop
2017-01-21 13:28:48 +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
ulukyn@gmail.com
c43627159c
Fixed: Scenographic Editor lua issues
...
--HG--
branch : compatibility-develop
2017-01-11 16:27:25 +01:00
Nimetu
109725fc9e
Changed: Move dyn channel commands (/0, /1 ..) to commands.xml
...
--HG--
branch : develop
2017-01-11 15:12:06 +02:00
Nimetu
ab5aa5b2c4
Merge with develop
...
--HG--
branch : compatibility-develop
2017-01-10 15:09:55 +02:00
Nimetu
3e95a8b89f
Fixed: Client crash on bad PNG file from webig download.
...
--HG--
branch : develop
2017-01-10 14:07:11 +02:00
Nimetu
a7ca4ec3b9
Changed: Minor change
...
--HG--
branch : develop
2017-01-10 14:07:06 +02:00
ulukyn@gmail.com
8dce467417
Fixed: Scenographic Editor crash the client (revert bad commit of actions.h)
...
--HG--
branch : compatibility-develop
2017-01-10 12:35:53 +01:00
ulukyn@gmail.com
56c4674d10
Fixed: Scenographic Editor crash the client
...
--HG--
branch : compatibility-develop
2017-01-10 12:32:44 +01:00
kervala
47ac7ddd94
Merge with develop
...
--HG--
branch : compatibility-develop
2017-01-04 14:25:23 +01:00
kervala
9541e78219
Changed: Exit if line is truncated
...
--HG--
branch : develop
2017-01-04 14:24:25 +01:00
kervala
5af01c7e24
Fixed: Support for quads and any number of vertices for a face
...
--HG--
branch : develop
2017-01-04 14:24:02 +01:00
kervala
74558b9517
Changed: Allow to define output bitmap size
...
--HG--
branch : develop
2017-01-04 14:22:38 +01:00
kervala
0a86498c0f
Merge with develop
...
--HG--
branch : compatibility-develop
2017-01-03 13:43:52 +01:00
kervala
ca5a4f6788
Changed: Use NLMISC::drawFullLine instead of NLMISC::drawLine for better render
...
--HG--
branch : develop
2017-01-03 13:43:31 +01:00
kervala
7fac9341ee
Fixed: V coordinates are inverted
...
--HG--
branch : develop
2017-01-03 13:42:32 +01:00
kervala
eb91466d3b
Merge with develop
...
--HG--
branch : compatibility-develop
2017-01-03 12:31:25 +01:00
kervala
b55f659a12
Changed: Generate an UV map from a Wavefront OBJ file
...
--HG--
branch : develop
2017-01-03 12:28:31 +01:00