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
kervala
51aac8b5e9
Changed: Removed extraneous spaces
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
2c38ac8e2e
Changed: Implement mp3 player playlist
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
Nimetu
136d07bf4f
Fixed: Save mp3 player volume to icfg
2016-08-25 22:14:58 +03:00
Erwan GEORGET
edf0b19c75
Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI
2016-08-09 22:12:11 +02: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
bdd66f019d
Changed: Fix text align in patch windows, see #280
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
kervala
99aa166911
Added: New version of "DejaVu Sans" fonts (and monospace version)
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
Nimetu
9fb14c42d8
Added: Monospace font options
...
--HG--
branch : develop
2016-07-24 16:07:18 +03:00
Nimetu
74a4e107b6
Added: Monospace font options
2016-07-24 16:07:18 +03:00
Nimetu
705d3a6168
Merge with develop
...
--HG--
branch : compatibility-develop
2016-07-23 11:28:22 +03:00
Nimetu
91c9594a5a
Fixed: Wrong align on info window on character creation screen.
...
--HG--
branch : develop
2016-07-23 11:04:45 +03:00
Nimetu
eb877f41ad
Fixed: Wrong align on info window on character creation screen.
2016-07-23 11:04:45 +03:00
kervala
c57d77c1ba
Changed: Fix right text align by Info Window (patch by Riasan)
...
--HG--
branch : develop
2016-07-20 14:07:10 +02:00
kervala
6a6aa0eec3
Changed: Fix right text align by Info Window (patch by Riasan)
2016-07-20 14:07:10 +02:00
Riasan
0a75d3ef7d
Fix: right text align by Info Window
...
--HG--
branch : compatibility-develop
2016-07-19 20:54:54 +02:00
kervala
13d7f5c1dd
Merge with develop
...
--HG--
branch : compatibility-develop
2016-07-19 09:42:54 +02:00
kervala
b4d1f7febe
Fixed: Typos
...
--HG--
branch : develop
2016-07-19 09:41:27 +02:00
kervala
d2dece0aaa
Fixed: Typos
2016-07-19 09:41:27 +02:00
kervala
0e2d475ab2
Changed: Fox right text align by map and respawn window (patch by Riasan)
...
--HG--
branch : develop
2016-07-19 09:41:12 +02:00
kervala
69e68f8d3c
Changed: Fox right text align by map and respawn window (patch by Riasan)
2016-07-19 09:41:12 +02:00
Nimetu
0a00bca5a3
Backed out changeset: 61529eb4c24f
...
--HG--
branch : compatibility-develop
2016-07-18 23:44:47 +03:00
Riasan
b526dab356
Fix: Right Text Align by Map and Rewspwan Windows
...
--HG--
branch : compatibility-develop
2016-07-18 20:14:20 +02:00
Nimetu
d1fdaaf786
Merge with develop
...
--HG--
branch : compatibility-develop
2016-07-09 14:59:22 +03:00
Nimetu
bc98a23af3
Fixed: Re-add handsbar horizontal mode
...
--HG--
branch : develop
2016-07-09 14:54:11 +03:00
Nimetu
5290549a48
Fixed: Re-add handsbar horizontal mode
2016-07-09 14:54:11 +03:00
kervala
c3202d871e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-07-09 13:48:03 +02:00
kervala
d4a9b63540
Changed: Apply changes from default interface to Syphox one
...
--HG--
branch : develop
2016-07-09 13:47:30 +02:00
kervala
fc0ec87fc9
Changed: Apply changes from default interface to Syphox one
2016-07-09 13:47:30 +02:00
kervala
8e0846e16f
Changed: Bad Position of Text after fix the Text High (by Riasan)
...
--HG--
branch : develop
2016-07-09 08:55:24 +02:00
kervala
d0e2b9441e
Changed: Bad Position of Text after fix the Text High (by Riasan)
2016-07-09 08:55:24 +02:00
Riasan
f4bb446439
Fix: Bad Position of Text after fix the Text High
...
--HG--
branch : compatibility-develop
2016-07-02 23:07:47 +02:00
kervala
8375badcdd
Merge with develop
...
--HG--
branch : compatibility-develop
2016-07-01 10:42:21 +02:00
kervala
438d637f66
Changed: Apply changes from default interface to Syphox one
...
--HG--
branch : develop
2016-07-01 10:41:48 +02:00
kervala
7332a26dc6
Changed: Apply changes from default interface to Syphox one
2016-07-01 10:41:48 +02:00
kervala
90362c3609
Merge with develop
...
--HG--
branch : compatibility-develop
2016-06-26 19:43:53 +02:00
kervala
766989a0b3
Fixed: Better alignment of text
...
--HG--
branch : develop
2016-06-26 19:39:00 +02:00
kervala
61c5cf3126
Fixed: Better alignment of text
2016-06-26 19:39:00 +02:00
kervala
b02321e36f
Fixed: Wrong alignment of text in edit boxes
...
--HG--
branch : develop
2016-06-26 19:13:34 +02:00
kervala
6eacd63fd1
Fixed: Wrong alignment of text in edit boxes
2016-06-26 19:13:34 +02:00
kervala
9361a70549
Fixed: Wrong alignment of text on character selection screen
...
--HG--
branch : develop
2016-06-26 19:01:49 +02:00
kervala
60cf3bfeb2
Fixed: Wrong alignment of text on character selection screen
2016-06-26 19:01:49 +02:00
kervala
c6f3c0fb73
Fixed: Wrong alignment of text on login screen
...
--HG--
branch : develop
2016-06-26 18:49:27 +02:00
kervala
2530930a16
Fixed: Wrong alignment of text on login screen
2016-06-26 18:49:27 +02:00
Nimetu
a8113bfaff
Merge with develop
...
--HG--
branch : compatibility-develop
2016-06-16 23:32:47 +03:00
Nimetu
7e488219a7
Changed: Add scrollbar to macro commands list
...
--HG--
branch : develop
2016-06-16 23:32:31 +03:00
Nimetu
583c540995
Changed: Add scrollbar to macro commands list
2016-06-16 23:32:31 +03:00
Nimetu
f90fa23206
Merge with develop
...
--HG--
branch : compatibility-develop
2016-06-12 12:49:14 +03:00
Nimetu
f201abe6db
Changed: Set <textarea>, <input> font style
...
--HG--
branch : develop
2016-06-12 10:30:16 +03:00
Nimetu
76c8a8a055
Changed: Set <textarea>, <input> font style
2016-06-12 10:30:16 +03:00
Nimetu
caf8c5195c
Added: Rows attribute to <textarea> element
...
--HG--
branch : develop
2016-06-12 10:22:22 +03:00
Nimetu
0e3a6b8a3e
Added: Rows attribute to <textarea> element
2016-06-12 10:22:22 +03:00
kervala
1ae20f6abb
Changed: Unix EOL
...
--HG--
branch : develop
2016-05-25 23:20:02 +02:00
kervala
a4881c2af5
Changed: Unix EOL
2016-05-25 23:20:02 +02:00
kervala
a1994702a3
Merge with develop
...
--HG--
branch : compatibility-develop
2016-05-24 11:25:04 +02:00
kervala
fa7a46205d
Fixed: Inconsistent EOL
...
--HG--
branch : develop
2016-05-24 11:24:36 +02:00
kervala
5a699abe0a
Fixed: Inconsistent EOL
2016-05-24 11:24:36 +02:00
Cédric OCHS
b2fdf9c936
Merged in Llapp/ryzomcore/dev-syui (pull request #139 )
...
UI modification:
--HG--
branch : develop
2016-05-23 14:35:20 +02:00
Cédric OCHS
17f094c671
Merged in Llapp/ryzomcore/dev-syui (pull request #139 )
...
UI modification:
2016-05-23 14:35:20 +02:00
SIELA1915
7e3b9d56bb
changed all HP, Sap, Stamina and Focus occurences
2016-05-23 11:45:43 +02:00
Llapp
3c6a7f4daf
UI modification:
...
*added some new textures
*added code
*changed guild window
*added team invite buttons to tell window, friendlist and guildlist
*added percent view for target HP
*added target sap and stam in target window with percent view
*added pvp icon for target window
*added fps view into radar
*added openable option for guild and friendlist
*added guild invite button
--HG--
branch : dev-syui
2016-05-22 23:04:30 +02:00
Llapp
4db7f2c959
UI modification:
...
*added some new textures
*added code
*changed guild window
*added team invite buttons to tell window, friendlist and guildlist
*added percent view for target HP
*added target sap and stam in target window with percent view
*added pvp icon for target window
*added fps view into radar
*added openable option for guild and friendlist
*added guild invite button
2016-05-22 23:04:30 +02:00
Nimetu
f7f275671f
Merge with develop
...
--HG--
branch : compatibility-develop
2016-05-05 15:01:10 +03:00
Nimetu
6f8a9b8108
Changed: Increase default request timeout for web browsers
...
--HG--
branch : develop
2016-05-05 15:00:28 +03:00
Nimetu
f3b13af5e8
Changed: Increase default request timeout for web browsers
2016-05-05 15:00:28 +03:00
kervala
601cb4347a
Merge with develop
...
--HG--
branch : compatibility-develop
2016-05-04 10:09:49 +02:00
kervala
99b87b1128
Changed: Update interfaces files with patchlet version
...
--HG--
branch : develop
2016-05-04 10:07:03 +02:00
kervala
e1f8ac7d1b
Changed: Update interfaces files with patchlet version
2016-05-04 10:07:03 +02:00
Dremor
159898b081
Merge branch 'ryzomcore' into 'develop'
...
Merge Ryzomcore into Develop
See merge request !2
2016-05-02 08:01:47 +00:00
kervala
346a0297f6
Merge with develop
...
--HG--
branch : compatibility-develop
2016-04-12 15:43:47 +02:00
kervala
6e05750fa3
Changed: Removed extraneous spaces at the end of lines
...
--HG--
branch : develop
2016-04-12 15:42:53 +02:00
kervala
a545a8b091
Changed: Removed extraneous spaces at the end of lines
2016-04-12 15:42:53 +02:00
kervala
6cd73cca03
Merge with develop
...
--HG--
branch : compatibility-develop
2016-04-09 13:02:40 +02:00
kervala
0a110eff4f
Fixed: Wrong display of max resist levels
...
--HG--
branch : develop
2016-04-09 13:02:12 +02:00
kervala
8c04ffe056
Fixed: Wrong display of max resist levels
2016-04-09 13:02:12 +02:00
SIELA1915
52702f64f1
merged from compatibility-develop
2016-03-28 02:12:19 +02:00
Nimetu
e2d1213708
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-22 12:23:04 +02:00
Nimetu
2be2717ee7
Merge with develop
2016-03-22 12:23:04 +02:00
Nimetu
2eb1d7b293
Added: AppZone and WebBrowser components
...
--HG--
branch : develop
2016-03-22 11:11:47 +02:00
Nimetu
5f53c6caa6
Added: AppZone and WebBrowser components
2016-03-22 11:11:47 +02:00
kervala
114543ba07
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-16 19:15:11 +01:00
kervala
1b724c56fc
Merge with develop
2016-03-16 19:15:11 +01:00
kervala
8bc243ffe1
Changed: Removed some semicolons in Lua when useless
...
--HG--
branch : develop
2016-03-16 19:13:07 +01:00
kervala
7d23cd6f52
Changed: Removed some semicolons in Lua when useless
2016-03-16 19:13:07 +01:00
kervala
5121cdb7d4
Changed: Use # in Lua to get the size of an array
...
--HG--
branch : develop
2016-03-15 17:55:58 +01:00
kervala
85e9f7eadc
Changed: Use # in Lua to get the size of an array
2016-03-15 17:55:58 +01:00
kervala
b0d50dea69
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-15 12:37:11 +01:00
kervala
a4be9e2479
Merge with develop
2016-03-15 12:37:11 +01:00
kervala
61934be39a
Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first
...
--HG--
branch : develop
2016-03-15 12:35:47 +01:00
kervala
445ba78816
Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first
2016-03-15 12:35:47 +01:00
kervala
c3d3024507
Changed: Remived useless semicolons
...
--HG--
branch : develop
2016-03-15 12:34:45 +01:00
kervala
966500e1a1
Changed: Remived useless semicolons
2016-03-15 12:34:45 +01:00
kervala
13abb130bd
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-15 00:08:40 +01:00
kervala
b05d1352f8
Merge with develop
2016-03-15 00:08:40 +01:00
kervala
bb67a604e6
Fixed: Wrong first and last names orders and some minor bugs
...
--HG--
branch : develop
2016-03-15 00:03:06 +01:00
kervala
72bc7a8fd0
Fixed: Wrong first and last names orders and some minor bugs
2016-03-15 00:03:06 +01:00
kervala
efac9c97b1
Changed: Use more explicit variable names
...
--HG--
branch : develop
2016-03-15 00:01:29 +01:00
kervala
7ee9833bf3
Changed: Use more explicit variable names
2016-03-15 00:01:29 +01:00
kervala
7366a1f994
Changed: Minor changes (spaces replaced by tabs)
...
--HG--
branch : develop
2016-03-14 23:58:58 +01:00
kervala
d2bc560ca8
Changed: Minor changes (spaces replaced by tabs)
2016-03-14 23:58:58 +01:00
kaetemi
b9d366372e
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-10 12:09:18 +01:00
kaetemi
4a581d89fa
Merge with develop
2016-03-10 12:09:18 +01:00
kervala
8dec2fbb54
Changed: Random names generator updated by Osquallo
...
--HG--
branch : develop
2016-03-09 11:21:53 +01:00
kervala
68814a1d94
Changed: Random names generator updated by Osquallo
2016-03-09 11:21:53 +01:00
kervala
46f6df3310
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-05 11:51:08 +01:00
kervala
e280f89ea1
Merge with develop
2016-03-05 11:51:08 +01:00
kervala
865bece41c
Changed: Random names generator updated by Osquallo
...
--HG--
branch : develop
2016-03-05 11:29:06 +01:00
kervala
ca833bd3e5
Changed: Random names generator updated by Osquallo
2016-03-05 11:29:06 +01:00
Nimetu
5c7eeb6d32
Merge with develop
...
--HG--
branch : compatibility-develop
2016-03-01 22:39:10 +02:00
Nimetu
beadf6657b
Merge with develop
2016-03-01 22:39:10 +02:00
Nimetu
bc8fd9fe2b
Added: Horizontal mode to second action bar
...
--HG--
branch : develop
2016-03-01 22:30:05 +02:00
Nimetu
3b9da62b2e
Added: Horizontal mode to second action bar
2016-03-01 22:30:05 +02:00
Nimetu
a95c887534
Changed: Implement multi-row select box
...
--HG--
branch : develop
2016-02-23 10:52:21 +02:00
Nimetu
de83ae89eb
Changed: Implement multi-row select box
2016-02-23 10:52:21 +02:00
kervala
bca35ec6e1
Changed: Updated world_editor_classes.xml
...
--HG--
branch : compatibility-develop
2016-02-21 17:28:43 +01:00
kervala
d235209038
Changed: Updated world_editor_classes.xml
2016-02-21 17:28:43 +01:00
kervala
3728c5d00e
Changed: Guild missions
...
--HG--
branch : compatibility-develop
2016-02-21 13:51:09 +01:00
kervala
7c9ff22f28
Changed: Guild missions
2016-02-21 13:51:09 +01:00
kervala
e2d437e846
Changed: Minor changes
...
--HG--
branch : compatibility-develop
2016-02-21 13:50:44 +01:00
kervala
81a5a15b4d
Changed: Minor changes
2016-02-21 13:50:44 +01:00
kervala
ece1809a70
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-20 20:44:23 +01:00
kervala
bb4991b58b
Merge with develop
2016-02-20 20:44:23 +01:00
kervala
c6ac53598b
Changed: Renamed uiCP_Surame and uiCP_Name to uiCP_FirstName and uiCP_LastName
...
--HG--
branch : develop
2016-02-20 20:42:29 +01:00
kervala
c4226f89ea
Changed: Renamed uiCP_Surame and uiCP_Name to uiCP_FirstName and uiCP_LastName
2016-02-20 20:42:29 +01:00
kervala
ae100981d7
Changed: Removed extraenous spaces at the end of lines
...
--HG--
branch : develop
2016-02-20 20:41:34 +01:00
kervala
08c30dc32b
Changed: Removed extraenous spaces at the end of lines
2016-02-20 20:41:34 +01:00
kervala
c652fa8e37
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-20 19:57:43 +01:00
kervala
afc57f1b2a
Merge with develop
2016-02-20 19:57:43 +01:00
kervala
087ee9b76b
Changed: Added IG Name Generator by Osquallo (thanks a lot for your amazing work!)
...
--HG--
branch : develop
2016-02-20 19:48:13 +01:00
kervala
9dff74badf
Changed: Added IG Name Generator by Osquallo (thanks a lot for your amazing work!)
2016-02-20 19:48:13 +01:00
SIELA1915
abd1f8c41b
Merged with compatibility-develop
2016-02-14 16:55:32 +01:00
kervala
b873aae389
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-13 23:43:04 +01:00
kervala
24081ab894
Merge with develop
2016-02-13 23:43:04 +01:00
kervala
4c8d804d25
Fixed: Don't force lower case with only first letter in upper case
...
--HG--
branch : develop
2016-02-13 23:30:59 +01:00
kervala
53ab0c5aed
Fixed: Don't force lower case with only first letter in upper case
2016-02-13 23:30:59 +01:00
Nimetu
6230b76778
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-13 17:36:57 +02:00
Nimetu
6ee3c2d8c1
Merge with develop
2016-02-13 17:36:57 +02:00
Nimetu
5d44cc4075
Changed: Set context menu case mode to 'normal'
...
--HG--
branch : develop
2016-02-13 17:36:40 +02:00
Nimetu
3962546457
Changed: Set context menu case mode to 'normal'
2016-02-13 17:36:40 +02:00
SIELA1915
f5459a1b9b
merge from compatibility-develop
2016-02-12 18:28:23 +01:00
kervala
3a0576a740
Merge with develop
...
--HG--
branch : compatibility-develop
2016-02-08 14:37:34 +01:00