130 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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