Commit graph

207 commits

Author SHA1 Message Date
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
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
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
88c81e8895 Merge with develop
--HG--
branch : compatibility-develop
2017-03-14 23:42:52 +02: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
6c9bbb8c0b Allow support for room / guild movement
--HG--
branch : item_group
2017-03-09 18:54:12 +01:00
Guillaume Dupuy
9fffec8ef1 Added interface for item groups
--HG--
branch : item_group
2017-03-09 17:47:25 +01:00
Nimetu
cea9549cd8 Added: Clickable urls in chat text (issue 282)
--HG--
branch : develop
2017-01-21 13:29:34 +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
kervala
89318ea69d Merge with develop
--HG--
branch : compatibility-develop
2016-12-19 12:02:47 +01:00
kervala
1e45f7bd45 Fixed: Truncated bubble texts
--HG--
branch : develop
2016-12-19 12:01:55 +01:00
kervala
c8bc57d0a4 Merge with develop
--HG--
branch : compatibility-develop
2016-12-18 20:44:33 +01:00
kervala
8da20b30cc Changed: Merged changes from compatibility-develop that should also be in develop
--HG--
branch : develop
2016-12-18 20:39:16 +01:00
ulukyn@gmail.com
3f58cbd077 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 22:24:49 +01:00
ulukyn@gmail.com
b0dc979718 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 20:16:42 +01:00
ulukyn@gmail.com
6238139c08 Fixed: Load Scenographic Editor lua files
--HG--
branch : compatibility-develop
2016-12-14 16:14:33 +01:00
ulukyn@gmail.com
6ff3cc9d77 Added: sceneedit.lua and json.lua used by Scenographic Editor
--HG--
branch : compatibility-develop
2016-12-14 13:36:59 +01:00
Cédric OCHS
f864aceee1 Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command

--HG--
branch : compatibility-develop
2016-12-04 12:43:36 +00:00
Guillaume Dupuy
6bfb1fb588 Allow target to work with sheetName and a quiet option
HG : Enter commit message.  Lines beginning with 'HG:' are removed.

--HG--
branch : target_sheet
2016-11-28 00:54:33 +01:00
Nimetu
082b23ef55 Merge with develop
--HG--
branch : compatibility-develop
2016-11-26 15:24:24 +02:00
Nimetu
3b0c7e896c Changed: minor change to ui
--HG--
branch : develop
2016-11-26 15:24:05 +02:00
Nimetu
cf338681fa Changed: Add free-view mouse tablet mode option
--HG--
branch : develop
2016-11-26 14:55:38 +02:00
Nuno Gonçalves
8b2d23109f Changed: Fix the way to load ryzhome lua/xml files
--HG--
branch : compatibility-develop
2016-11-07 13:53:41 +01:00
kervala
68163157ba Merge with develop
--HG--
branch : compatibility-develop
2016-10-23 16:29:49 +02:00
kervala
e957923ed2 Fixed: Default action tooltip text position
--HG--
branch : develop
2016-10-23 16:24:18 +02:00
kervala
eedebb6833 Changed: Removed trailing spaces at EOL
--HG--
branch : develop
2016-10-23 16:16:48 +02:00
kervala
c3c3951bd0 Merge with develop
--HG--
branch : compatibility-develop
2016-10-22 19:40:34 +02:00
kervala
8db56f5671 Changed: Name edit box better aligned
--HG--
branch : develop
2016-10-22 19:38:13 +02:00
kervala
d52cede669 Fixed: Wrong height in action edit
--HG--
branch : develop
2016-10-22 19:38:05 +02:00
kervala
c2d0a3690f Changed: Name edit box better aligned
--HG--
branch : develop
2016-10-22 19:24:20 +02:00
kervala
de3d3971b7 Changed: Removed trailing spaces at EOL
--HG--
branch : develop
2016-10-22 18:50:43 +02:00
kervala
032e46b97a Added: Ryzhome files
--HG--
branch : compatibility-develop
2016-09-25 14:21:42 +02:00
kervala
ce576954e0 Merge with develop
--HG--
branch : compatibility-develop
2016-09-24 14:22:22 +02:00
kervala
1ce480a809 Changed: Minor change
--HG--
branch : develop
2016-09-24 14:00:01 +02:00
kervala
3c4f5bfd4c Changed: Moved Syphox mod to ryzom/data/mods to not conflict when creating gamedev.bnp
--HG--
branch : develop
2016-09-24 13:59:09 +02:00
kervala
fbe367bd39 Removed: Textures shouldn't go in gamedev
--HG--
branch : compatibility-develop
2016-09-22 21:56:28 +02:00
kervala
6a7f4083f3 Changed: Moved SSL certificate to gamedev
--HG--
branch : compatibility-develop
2016-09-21 12:46:04 +02:00
kervala
ce3cb3efa4 Merge with develop
--HG--
branch : compatibility-develop
2016-09-20 21:59:11 +02:00
kervala
dc2dad8c77 Changed: Removed extraneous spaces
--HG--
branch : develop
2016-09-20 21:40:17 +02:00
Nimetu
0766ec46f8 Merge with develop
--HG--
branch : compatibility-develop
2016-08-30 21:27:56 +03:00
Nimetu
ee128cba1e Changed: Implement mp3 player playlist
--HG--
branch : develop
2016-08-30 21:25:58 +03:00
Nimetu
b08fa15377 Merge with develop
--HG--
branch : compatibility-develop
2016-08-25 22:18:35 +03:00
Nimetu
b6c03d5df8 Fixed: Save mp3 player volume to icfg
--HG--
branch : develop
2016-08-25 22:14:58 +03:00
kervala
20ac3b6698 Merge with develop
--HG--
branch : compatibility-develop
2016-07-25 10:46:09 +02:00
kervala
0f772c8605 Changed: Fix text align in patch windows, see #280
--HG--
branch : develop
2016-07-25 10:45:07 +02:00
kervala
5097e05d51 Added: New version of "DejaVu Sans" fonts (and monospace version)
--HG--
branch : develop
2016-07-25 09:35:23 +02:00
Nimetu
16eeb70f61 Merge with develop
--HG--
branch : compatibility-develop
2016-07-24 16:09:25 +03:00