4821 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
kaetemi	5960376de3	Remove graft tag	2014-04-30 13:05:40 +02:00
kaetemi	cb05b828ae	Merge with default	2014-04-30 13:02:11 +02:00
kaetemi	fb56ef3fdc	Merge	2014-04-30 12:57:54 +02:00
kaetemi	c93b04df1d	Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea	2014-04-30 12:54:20 +02:00
kaetemi	989965e33f	Fix EOL	2014-04-30 12:53:06 +02:00
kervala	0083870c8a	Changed: Updated client_default.cfg to official client one	2014-04-30 09:30:32 +02:00
kervala	8d07daa82d	Merge with default	2014-04-30 09:19:45 +02:00
kervala	226a3131b1	Changed: Small typo	2014-04-30 09:18:31 +02:00
kervala	3dca7304f0	Fixed #151: White box on character selection screen (a big thanks to nimetu for the patch!)	2014-04-29 10:31:02 +02:00
kervala	8c180c2520	Fixed: tmpFlagRemovedPatchCategories not needed anymore because RemovedPatchCategories defined in login_patch.cpp	2014-04-26 22:51:03 +02:00
sfb	df06ab1d7b	Modified the CTestConfig to point at the new CI server.	2014-04-25 14:00:46 -05:00
kervala	60d59a2300	Changed: Official Ryzom URLs	2014-04-25 12:00:29 +02:00
kervala	5e4c1b846f	Fusion avec default	2014-04-25 11:59:28 +02:00
kervala	2f2bded357	Changed: Minor changes	2014-04-25 11:58:35 +02:00
kervala	9c9d3973e1	Default merge	2014-04-24 23:01:54 +02:00
kervala	eedaee3da3	Changed: Replaced strlwr by toLower	2014-04-24 22:59:29 +02:00
kervala	48220f401c	Backed out changeset: 79980ce60498	2014-04-24 19:31:53 +02:00
kervala	1ad1fb7367	Fusion with compatibility	2014-04-24 19:26:05 +02:00
kervala	22374fb124	Fusion avec default	2014-04-24 19:16:42 +02:00
Cédric OCHS	a607fab7e9	Merged in nimetu/ryzomcore/Issue#130 (pull request #65) ... Properly restore saved camera distance from config file (issue #130)	2014-04-24 19:14:01 +02:00
Cédric OCHS	861b17556d	Merged in nimetu/ryzomcore/Issue#145 (pull request #66) ... Fix compiling on linux with new OpenGL headers (issue #145)	2014-04-24 19:11:05 +02:00
kervala	4da04fdfaa	Changed: Replaced strlwr by toLower	2014-04-24 18:11:16 +02:00
Nimetu	6217b46193	Fix compiling on linux with new OpenGL headers (issue #145)	2014-04-23 23:23:23 +03:00
Nimetu	f593aa4eaf	Properly restore saved camera distance from config file (issue #130)	2014-04-23 23:20:13 +03:00
dfighter1985	c83ccc76bb	Tile Editor crash fixes.	2014-04-23 02:10:14 +02:00
dfighter1985	324aa7f851	Build fixes.	2014-04-23 00:49:17 +02:00
dfighter1985	e24447e98c	Merged Georges Editor branch.	2014-04-22 21:12:26 +02:00
dfighter1985	d88a20ffc8	Merged Tile Editor branch.	2014-04-22 21:11:49 +02:00
dfighter1985	392061f06b	Merged default.	2014-04-22 21:10:19 +02:00
dfighter1985	04b2b69909	Merged default.	2014-04-22 21:02:34 +02:00
dfighter1985	916c9bf919	We can now drag elements, they will disappear and whatnot, but at least they can be dragged!	2014-04-21 19:30:33 +02:00
Matthew Lagoe	9eee69f72d	Merged in shubham_meena/ryzomcore/issue#119 (pull request #63) ... removed wrong panel from settings page	2014-04-21 03:31:14 -07:00
botanic	10cdf495ca	missing =	2014-04-21 03:03:39 -07:00
botanic	1191a37816	fix for missing include	2014-04-21 03:00:19 -07:00
botanic	1c30c1067e	php is_writable is not reliable	2014-04-21 02:39:29 -07:00
dfighter1985	83e0c1ceda	Refactored input event handling a bit.	2014-04-20 21:41:57 +02:00
dfighter1985	80e6d911b6	Merge gsoc2012-gui-editor.	2014-04-19 22:06:14 +02:00
dfighter1985	8c23925246	Merge default.	2014-04-19 21:53:29 +02:00
kervala	59042ccb6a	Changed: Updated OpenGL and OpenGL ES headers	2014-04-17 10:44:03 +02:00
kervala	396948f89a	Fixed: nglXSwapIntervalEXT return type should be void	2014-04-17 10:16:30 +02:00
kervala	3d95fa2d71	Changed: Find DirectX libraries in alternative folders	2014-04-11 17:56:26 +02:00
liria	0c0eff560f	Merged default into lightmap_optimizer_port_to_linux	2014-04-11 16:47:50 +02:00
shubham_meena	3d2b66af73	remove wrong panel from settings page	2014-04-11 13:25:12 +05:30
botanic	01a7736de6	fix paths	2014-04-07 08:03:55 -07:00
botanic	7e27e78c25	missing .	2014-04-07 06:39:41 -07:00
botanic	23209d1735	display erors on installer	2014-04-07 06:35:15 -07:00
botanic	5e61238b6c	missed it on all of them	2014-04-07 06:29:44 -07:00
botanic	324bfb8623	Merge	2014-04-07 06:27:49 -07:00
botanic	2277f6fbcb	missed a ../	2014-04-07 06:27:15 -07:00
Matthew Lagoe	3316ed1c3d	Merged in shubham_meena/ryzomcore/issue#120 (pull request #60) ... changed hardcoded location of ams_lib with location defined in configuration	2014-04-06 22:31:39 -07:00