Commit graph

3882 commits

Author SHA1 Message Date
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
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
2f2bded357 Changed: Minor changes 2014-04-25 11:58:35 +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
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
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
Matthew Lagoe
80d3670385 Merged in shubham_meena/ryzomcore/Issue#123 (pull request #59)
Changed log-in from username to both username and email
2014-04-06 22:29:55 -07:00
liria
89097aa4a1 Typo correction 2014-04-05 13:49:14 +00:00
liria
610226d100 Merged default into lightmap_optimizer_port_to_linux 2014-04-05 15:40:17 +02:00
kaetemi
07333cd822 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
7af85d6f2f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
9edd54c446 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
cd04a596cd Backed out changeset: 3937923211ec 2014-03-29 12:45:22 +01:00
Jan Boon
b210450b8d Merged in shubham_meena/ryzomcore/Issue#121 (pull request #58)
Added tile of web in translations
2014-03-28 20:02:14 +01:00
Jan Boon
8c60f711fe Merged in shubham_meena/ryzomcore/issue#127 (pull request #56)
collation changed to utf8_unicode_ci
2014-03-28 20:01:46 +01:00
kaetemi
7d9c76704f Merge 2014-03-28 19:50:21 +01:00
kaetemi
2dd9b8c1f6 Moved tag latest-default-graft to changeset 5f0b297fb908 (from changeset 8162b598e9e2) 2014-03-28 19:43:30 +01:00
kervala
213749f410 Changed: Replaced some Mac OS X warnings by TODO comments 2014-03-27 16:36:00 +01:00
kervala
b118643bbd Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
a0496b0849 Moved tag latest-default-graft to changeset 8162b598e9e2 (from changeset e4680cd1f1ce) 2014-03-28 19:42:43 +01:00
kervala
9f628090cf Changed: Aligned methods names 2014-03-27 16:34:55 +01:00