Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7796 commits 14 branches 1 tag 255 MiB
Commit graph

220 commits

Author SHA1 Message Date
Nimetu
37d6dc50f0 Merge with develop 
--HG--
branch : compatibility-develop
 2017-08-15 12:39:25 +03:00
Nimetu
9390f9cca5 Changed: Sort tribe fame list 
--HG--
branch : develop
 2017-08-15 11:54:24 +03:00
Nimetu
30512804d5 Merge with develop 
--HG--
branch : compatibility-develop
 2017-07-12 21:23:08 +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
Nuno Gonçalves
648e3ba184 Fixed: update color instead status 
--HG--
branch : compatibility-develop
 2017-06-27 14:38:08 +02:00
Nuno Gonçalves
c9c0cbe88f Added: New icon for new lock-loot system (in test on yubo) 
--HG--
branch : compatibility-develop
 2017-06-23 20:13:38 +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
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
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
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
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
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
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
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