kervala
|
c53133e7f2
|
Merge with develop
|
2016-12-04 19:19:15 +01:00 |
|
kervala
|
061bed6635
|
Merge with develop
|
2016-12-04 18:39:21 +01:00 |
|
kervala
|
18ca67b199
|
Merge with develop
|
2016-12-04 17:32:34 +01:00 |
|
C?dric OCHS
|
916f1b008b
|
Merged in Glorf/ryzomcore/target_sheet (pull request #142)
Update target command
|
2016-12-04 12:43:36 +00:00 |
|
Guillaume Dupuy
|
54f128ad17
|
Use std::string instead of ucstring
|
2016-12-04 13:37:04 +01:00 |
|
Guillaume Dupuy
|
6f1197d633
|
Allow target to work with sheetName and a quiet option
HG : Enter commit message. Lines beginning with 'HG:' are removed.
|
2016-11-28 00:54:33 +01:00 |
|
Nimetu
|
dcf8b9b77c
|
Changed: Added translation
|
2016-11-26 15:24:27 +02:00 |
|
Nimetu
|
3ab4c7d714
|
Merge with develop
|
2016-11-26 15:24:24 +02:00 |
|
kervala
|
99ab8fba3e
|
Merge with develop
|
2016-11-26 13:20:32 +01:00 |
|
kervala
|
4bf0e1b0d9
|
Merge with develop
|
2016-11-25 10:44:44 +01:00 |
|
kervala
|
b8c25f7df9
|
Merge with develop
|
2016-11-20 16:41:28 +01:00 |
|
kervala
|
4d96978674
|
Merge with develop
|
2016-11-20 14:51:11 +01:00 |
|
kervala
|
0504c52eeb
|
Merge with develop
|
2016-11-13 16:53:35 +01:00 |
|
kervala
|
6a315be980
|
Merge with develop
|
2016-11-13 11:08:14 +01:00 |
|
kervala
|
4438ab108c
|
Merge with develop
|
2016-11-07 14:12:11 +01:00 |
|
Nuno Gon?alves
|
e157a7453e
|
Changed: Fix the way to load ryzhome lua/xml files
|
2016-11-07 13:53:41 +01:00 |
|
kervala
|
d865dc5a70
|
Merge with develop
|
2016-11-03 14:46:44 +01:00 |
|
kervala
|
9f434db97b
|
Merge with develop
|
2016-10-31 19:03:04 +01:00 |
|
kervala
|
d4bbc683a7
|
Changed: Updated all translations in UTF-8
|
2016-10-31 19:02:29 +01:00 |
|
kervala
|
7a1a082135
|
Merge with develop
|
2016-10-30 16:52:02 +01:00 |
|
kervala
|
0cfd8cb35d
|
Merge with develop
|
2016-10-27 16:48:45 +02:00 |
|
kervala
|
c9244568eb
|
Merge with develop
|
2016-10-26 14:30:17 +02:00 |
|
kervala
|
956da7f9da
|
Merge with develop
|
2016-10-25 17:41:54 +02:00 |
|
kervala
|
dc9c463483
|
Changed: Don't force PatchUrl in client_default.cfg
|
2016-10-25 14:10:25 +02:00 |
|
kervala
|
df676ede7e
|
Merge with develop
|
2016-10-25 11:50:27 +02:00 |
|
kervala
|
c02ab44327
|
Changed: Minor change
|
2016-10-24 13:54:20 +02:00 |
|
kervala
|
627dea4a06
|
Merge with develop
|
2016-10-23 16:29:49 +02:00 |
|
kervala
|
bb9608bcea
|
Merge with develop
|
2016-10-22 19:40:34 +02:00 |
|
kervala
|
14917f114f
|
Merge with develop
|
2016-10-22 16:55:51 +02:00 |
|
kervala
|
2945dbf3b9
|
Merge with develop
|
2016-10-21 20:00:50 +02:00 |
|
kervala
|
c26056c53a
|
Merge with develop
|
2016-10-21 19:04:29 +02:00 |
|
kervala
|
bf6f28ce43
|
Merge with develop
|
2016-10-21 16:54:50 +02:00 |
|
kervala
|
d078103453
|
Merge with develop
|
2016-10-21 16:50:04 +02:00 |
|
kervala
|
76c27c64f8
|
Merge with develop
|
2016-10-21 14:27:31 +02:00 |
|
C?dric OCHS
|
f1840fc189
|
Merged in Glorf/ryzomcore/fix_speed (pull request #141)
Displayed speed is now actual speed, fix #295
|
2016-10-21 06:15:56 +00:00 |
|
kervala
|
7e6c5c13bd
|
Merge with develop
|
2016-10-20 17:46:58 +02:00 |
|
Guillaume Dupuy
|
c584bb34b6
|
Forgot one 0.0f initialisation
|
2016-10-20 16:04:47 +02:00 |
|
Guillaume Dupuy
|
3e9ee0954b
|
Fix coding guidelines + double initialized as 0.0
|
2016-10-20 16:02:02 +02:00 |
|
kervala
|
f95d95bdc5
|
Merge with develop
|
2016-10-20 14:48:16 +02:00 |
|
kervala
|
52678ea899
|
Merge with develop
|
2016-10-20 13:55:34 +02:00 |
|
kervala
|
0111c69054
|
Merge with develop
|
2016-10-20 13:14:19 +02:00 |
|
kervala
|
c3bcfb42b8
|
Merge with develop
|
2016-10-20 13:08:48 +02:00 |
|
kervala
|
afc03e63ee
|
Merge with develop
|
2016-10-19 17:25:45 +02:00 |
|
kervala
|
6fc090d4c1
|
Merge with develop
|
2016-10-19 13:32:14 +02:00 |
|
kervala
|
a388c89fd5
|
Merge with develop
|
2016-10-19 10:50:26 +02:00 |
|
kervala
|
33e1dedbf1
|
Merge with develop
|
2016-10-19 09:52:38 +02:00 |
|
kervala
|
f2907587c4
|
Merge with develop
|
2016-10-18 20:35:14 +02:00 |
|
kervala
|
e5d8439a1d
|
Merge with develop
|
2016-10-18 17:50:19 +02:00 |
|
kervala
|
54c7e89e05
|
Merge with develop
|
2016-10-18 17:47:19 +02:00 |
|
kervala
|
0c63da38f1
|
Merge with develop
|
2016-10-18 13:43:08 +02:00 |
|
kervala
|
ff2bb04474
|
Merge with develop
|
2016-10-18 10:33:11 +02:00 |
|
kervala
|
80cbda23e5
|
Merge with develop
|
2016-10-18 10:27:44 +02:00 |
|
kervala
|
a31e0b8d25
|
Merge with develop
|
2016-10-17 20:45:43 +02:00 |
|
kervala
|
bbb97b7b5b
|
Merge with develop
|
2016-10-17 16:51:42 +02:00 |
|
kervala
|
4d36b39ebc
|
Merge with develop
|
2016-10-17 15:43:33 +02:00 |
|
kervala
|
b5a9e81b83
|
Merge with develop
|
2016-10-17 13:53:10 +02:00 |
|
kervala
|
eaa19cdfd2
|
Merge with develop
|
2016-10-17 13:30:00 +02:00 |
|
kervala
|
98a2f3740c
|
Merge with develop
|
2016-10-17 13:14:20 +02:00 |
|
kervala
|
25d66dafa2
|
Merge with develop
|
2016-10-17 13:09:17 +02:00 |
|
kervala
|
8a52b34e09
|
Merge with develop
|
2016-10-17 11:49:38 +02:00 |
|
kervala
|
364efba09d
|
Merge with develop
|
2016-10-17 11:35:24 +02:00 |
|
kervala
|
2379918a3e
|
Merge with develop
|
2016-10-16 17:39:37 +02:00 |
|
kervala
|
f358ae1c9a
|
Merge with develop
|
2016-10-16 17:31:37 +02:00 |
|
kervala
|
b8114b2cd6
|
Changed: Executable flags
|
2016-10-16 14:49:29 +02:00 |
|
Guillaume Dupuy
|
ad48baa3b1
|
Fix end of function comment
|
2016-10-15 20:15:22 +02:00 |
|
Guillaume Dupuy
|
de00d262c1
|
Remove debug message
|
2016-10-15 20:14:26 +02:00 |
|
Guillaume Dupuy
|
bf8677131b
|
Use double instead of float to allow big values of GameCycle (like on winchgate server)
|
2016-10-15 20:12:41 +02:00 |
|
Guillaume Dupuy
|
1020c758b9
|
Uses float to calculate latency for sabrina phrases
|
2016-10-15 19:04:22 +02:00 |
|
kervala
|
6fc8853d51
|
Merge with develop
|
2016-10-15 17:16:34 +02:00 |
|
kervala
|
913b43f243
|
Merge with develop
|
2016-10-15 10:37:56 +02:00 |
|
Guillaume Dupuy
|
0cfefb65f7
|
Use speed as an int instead of float to calculate latency
|
2016-10-14 21:19:27 +02:00 |
|
Guillaume Dupuy
|
480218b4c8
|
Make multiples states changes in one tick (if relevant)
|
2016-10-14 21:03:31 +02:00 |
|
Guillaume Dupuy
|
9ec5a6e693
|
Fixed a rare case where float and double mixup would result in an incorrect speed
|
2016-10-13 20:46:10 +02:00 |
|
kervala
|
4b6e360e22
|
Merge with develop
|
2016-10-13 19:51:38 +02:00 |
|
kervala
|
e67d86eeda
|
Merge with develop
|
2016-10-12 15:12:52 +02:00 |
|
kervala
|
8f33264131
|
Merge with develop
|
2016-10-11 20:28:25 +02:00 |
|
kervala
|
975a8f2d53
|
Merge with develop
|
2016-10-11 18:43:07 +02:00 |
|
kervala
|
ad26721df6
|
Merge with develop
|
2016-10-11 18:04:35 +02:00 |
|
kervala
|
2b4058ed95
|
Merge with develop
|
2016-10-10 20:47:56 +02:00 |
|
kervala
|
e668405115
|
Merge with develop
|
2016-10-10 20:03:13 +02:00 |
|
kervala
|
35b59843cf
|
Merge with develop
|
2016-10-10 18:55:28 +02:00 |
|
kervala
|
2715eecda7
|
Merge with develop
|
2016-10-10 16:36:38 +02:00 |
|
kervala
|
c315480e56
|
Merge with develop
|
2016-10-09 19:53:31 +02:00 |
|
kervala
|
276cfa4b60
|
Merge with develop
|
2016-10-09 15:34:28 +02:00 |
|
kervala
|
c0be448a85
|
Merge with develop
|
2016-10-08 18:29:31 +02:00 |
|
kervala
|
a4b3c7c01c
|
Merge with develop
|
2016-10-08 14:15:15 +02:00 |
|
kervala
|
51970f9b79
|
Merge with develop
|
2016-10-04 19:27:56 +02:00 |
|
kervala
|
643c0fabf2
|
Merge with develop
|
2016-10-04 12:04:23 +02:00 |
|
kervala
|
98066af393
|
Merge with develop
|
2016-10-03 17:22:46 +02:00 |
|
kervala
|
329402c1cf
|
Merge with develop
|
2016-10-03 10:02:06 +02:00 |
|
kervala
|
6b24cd95d0
|
Merge with develop
|
2016-10-01 14:11:10 +02:00 |
|
kervala
|
4fc06a0c63
|
Merge with develop
|
2016-10-01 13:10:05 +02:00 |
|
kervala
|
f888b9f3bf
|
Merge with develop
|
2016-09-29 20:47:46 +02:00 |
|
kervala
|
f983a551a2
|
Merge with develop
|
2016-09-29 17:08:03 +02:00 |
|
kervala
|
6eb85803eb
|
Merge with develop
|
2016-09-29 00:20:47 +02:00 |
|
kervala
|
6744ded402
|
Merge with develop
|
2016-09-28 23:55:21 +02:00 |
|
kervala
|
1fa75e0c6d
|
Merge with develop
|
2016-09-28 12:25:45 +02:00 |
|
kervala
|
3d304c1735
|
Changed: Updated translations
|
2016-09-27 14:57:12 +02:00 |
|
kervala
|
72f62fdf32
|
Merge with develop
|
2016-09-26 10:41:52 +02:00 |
|
kervala
|
4c692ba040
|
Added: Ryzhome files
|
2016-09-25 14:21:42 +02:00 |
|
kervala
|
d18317e532
|
Added: Missing files from data_common.bnp
|
2016-09-25 14:17:30 +02:00 |
|
kervala
|
3b23cddbdb
|
Merge with develop
|
2016-09-25 10:37:42 +02:00 |
|
kervala
|
e1555f9e24
|
Merge with develop
|
2016-09-24 15:54:47 +02:00 |
|
kervala
|
4c51c4e68c
|
Merge with develop
|
2016-09-24 14:22:22 +02:00 |
|
kervala
|
fc903ff30c
|
Removed: Textures shouldn't go in gamedev
|
2016-09-22 21:56:28 +02:00 |
|
kervala
|
bec471034f
|
Merge with develop
|
2016-09-22 18:48:22 +02:00 |
|
kervala
|
d6ca7b2657
|
Merge with develop
|
2016-09-22 18:12:21 +02:00 |
|
kervala
|
d8656a5578
|
Merge with develop
|
2016-09-22 11:40:42 +02:00 |
|
kervala
|
e80aac9953
|
Merge with develop
|
2016-09-21 18:04:29 +02:00 |
|
kervala
|
203490b838
|
Merge with develop
|
2016-09-21 17:38:33 +02:00 |
|
kervala
|
420bf07057
|
Merge with develop
|
2016-09-21 17:34:34 +02:00 |
|
kervala
|
2393e0660c
|
Merge with develop
|
2016-09-21 17:19:31 +02:00 |
|
kervala
|
1e733fec01
|
Merge with develop
|
2016-09-21 15:52:53 +02:00 |
|
kervala
|
faff5ad04d
|
Changed: Moved SSL certificate to gamedev
|
2016-09-21 12:46:04 +02:00 |
|
kervala
|
01423acdc5
|
Merge with develop
|
2016-09-21 10:04:04 +02:00 |
|
kervala
|
feac1ffdb4
|
Merge with develop
|
2016-09-21 09:57:47 +02:00 |
|
kervala
|
e20e3b4866
|
Merge with develop
|
2016-09-20 21:59:11 +02:00 |
|
kervala
|
c82b04b597
|
Merge with develop
|
2016-09-20 18:36:02 +02:00 |
|
kervala
|
61a3bc0c9a
|
Merge with develop
|
2016-09-20 17:51:27 +02:00 |
|
kervala
|
2455fc02d7
|
Merge with develop
|
2016-09-19 14:52:47 +02:00 |
|
kervala
|
5fc7c25be4
|
Merge with develop
|
2016-09-18 16:35:01 +02:00 |
|
kervala
|
e68258e56e
|
Merge with develop
|
2016-09-16 19:25:17 +02:00 |
|
kervala
|
16598659b5
|
Merge with develop
|
2016-09-16 19:00:32 +02:00 |
|
kervala
|
30ad6fa760
|
Merge with develop
|
2016-09-14 08:18:14 +02:00 |
|
kervala
|
58a8da6590
|
Merge with develop
|
2016-09-10 19:40:40 +02:00 |
|
kervala
|
b8bd9b4e33
|
Changed: Updated translations
|
2016-09-08 17:38:31 +02:00 |
|
kervala
|
8c0af53b48
|
Merge with develop
|
2016-09-03 10:15:39 +02:00 |
|
Nimetu
|
3cacd76a30
|
Changed: Added mp3 player playlist translation
|
2016-08-30 21:31:53 +03:00 |
|
Nimetu
|
3610c6c8cb
|
Merge with develop
|
2016-08-30 21:27:56 +03:00 |
|
Nimetu
|
5e712f3e02
|
Merge with develop
|
2016-08-30 18:39:58 +03:00 |
|
kervala
|
d16ab852f3
|
Merge with develop
|
2016-08-26 13:55:25 +02:00 |
|
kervala
|
8f8ded0f12
|
Merge with develop
|
2016-08-26 13:01:32 +02:00 |
|
Nimetu
|
dee80dc90e
|
Merge with develop
|
2016-08-25 22:18:35 +03:00 |
|
ulukyn
|
e9f3fa6ba4
|
Added: New getGroundZ lua function
|
2016-08-25 18:54:35 +02:00 |
|
kervala
|
0b4f365d60
|
Merge with develop
|
2016-08-16 18:27:42 +02:00 |
|
kervala
|
80275386ec
|
Merge with develop
|
2016-08-14 13:36:44 +02:00 |
|
kervala
|
5ea8a69890
|
Changed: Only enable Atys at first
|
2016-08-13 15:53:49 +02:00 |
|
kervala
|
1e12bb27cc
|
Merge with develop
|
2016-08-10 15:46:13 +02:00 |
|
kervala
|
8af64c9e71
|
Merge with develop
|
2016-08-06 20:12:39 +02:00 |
|
kervala
|
f797f55b8d
|
Merge with develop
|
2016-07-27 12:49:01 +02:00 |
|
kervala
|
87df259f07
|
Merge with develop
|
2016-07-27 12:44:09 +02:00 |
|
kervala
|
7ce529452f
|
Merge with develop
|
2016-07-26 18:23:35 +02:00 |
|
kervala
|
f81a367111
|
Merge with develop
|
2016-07-25 18:58:02 +02:00 |
|
kervala
|
dabd3b2fdb
|
Merge with develop
|
2016-07-25 10:46:09 +02:00 |
|
Nimetu
|
85838aec19
|
Merge with develop
|
2016-07-24 16:09:25 +03:00 |
|
Nimetu
|
0be0a1e9e7
|
Merge with develop
|
2016-07-23 11:28:22 +03:00 |
|
Riasan
|
8aefb645e1
|
Fix: right text align by Info Window
|
2016-07-19 20:54:54 +02:00 |
|
kervala
|
ca0346645b
|
Merge with develop
|
2016-07-19 09:42:54 +02:00 |
|
Nimetu
|
0d571e617e
|
Backed out changeset: 61529eb4c24f
|
2016-07-18 23:44:47 +03:00 |
|
Riasan
|
8f15a04d2d
|
Fix: Right Text Align by Map and Rewspwan Windows
|
2016-07-18 20:14:20 +02:00 |
|