Commit graph

5317 commits

Author SHA1 Message Date
kervala
fdd325166f Backed out changeset: 79980ce60498 2014-04-24 19:31:53 +02:00
kervala
adfb6e5e18 Fusion with compatibility 2014-04-24 19:26:05 +02:00
kervala
17f6aafb2e Fusion avec default 2014-04-24 19:16:42 +02:00
C?dric OCHS
9144f568b8 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
e00eb70bcf 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
065a485192 Changed: Replaced strlwr by toLower 2014-04-24 18:11:16 +02:00
Nimetu
5089520c26 Fix compiling on linux with new OpenGL headers (issue #145) 2014-04-23 23:23:23 +03:00
Nimetu
9869a530e6 Properly restore saved camera distance from config file (issue #130) 2014-04-23 23:20:13 +03:00
dfighter1985
25387c6cdc Tile Editor crash fixes. 2014-04-23 02:10:14 +02:00
dfighter1985
bab02839d6 Build fixes. 2014-04-23 00:49:17 +02:00
dfighter1985
d58f96bd93 Merged Georges Editor branch. 2014-04-22 21:12:26 +02:00
dfighter1985
8d31939380 Merged Tile Editor branch. 2014-04-22 21:11:49 +02:00
dfighter1985
8ae9c92722 Merged default. 2014-04-22 21:10:19 +02:00
dfighter1985
37410a17d9 Merged default. 2014-04-22 21:02:34 +02:00
dfighter1985
f9d92d6d6b 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
35bdcba93b 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
591d5129d7 missing = 2014-04-21 03:03:39 -07:00
botanic
b443deb3ca fix for missing include 2014-04-21 03:00:19 -07:00
botanic
ff4a43ef48 php is_writable is not reliable 2014-04-21 02:39:29 -07:00
dfighter1985
d365189cd7 Refactored input event handling a bit. 2014-04-20 21:41:57 +02:00
dfighter1985
113b4c990e Merge gsoc2012-gui-editor. 2014-04-19 22:06:14 +02:00
dfighter1985
62e425a18a Merge default. 2014-04-19 21:53:29 +02:00
kervala
2b5b6d65c5 Changed: Updated OpenGL and OpenGL ES headers 2014-04-17 10:44:03 +02:00
kervala
36b7b8c180 Fixed: nglXSwapIntervalEXT return type should be void 2014-04-17 10:16:30 +02:00
kervala
e358cc3344 Changed: Find DirectX libraries in alternative folders 2014-04-11 17:56:26 +02:00
liria
9cf10a8cf6 Merged default into lightmap_optimizer_port_to_linux 2014-04-11 16:47:50 +02:00
shubham_meena
52d6c786b1 remove wrong panel from settings page 2014-04-11 13:25:12 +05:30
botanic
87b6fd410a fix paths 2014-04-07 08:03:55 -07:00
botanic
326cc2b274 missing . 2014-04-07 06:39:41 -07:00
botanic
7b18331f1c display erors on installer 2014-04-07 06:35:15 -07:00
botanic
826a139dd2 missed it on all of them 2014-04-07 06:29:44 -07:00
botanic
5411537f93 Merge 2014-04-07 06:27:49 -07:00
botanic
5e25677359 missed a ../ 2014-04-07 06:27:15 -07:00
Matthew Lagoe
d313ffa44a 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
61bda09239 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
d22e986be4 Typo correction 2014-04-05 13:49:14 +00:00
liria
18b67b2337 Merged default into lightmap_optimizer_port_to_linux 2014-04-05 15:40:17 +02:00
kaetemi
3dcc7ea7f9 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
2d5a084c71 Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
cd52ea7535 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
34e2d511f4 Backed out changeset: 3937923211ec 2014-03-29 12:45:22 +01:00
Jan Boon
fea816019b 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
4da115f0dd 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
2f879fa342 Merge 2014-03-28 19:50:21 +01:00
kaetemi
cc8ce754cd Moved tag latest-default-graft to changeset 5f0b297fb908 (from changeset 8162b598e9e2) 2014-03-28 19:43:30 +01:00
kervala
4dce69bf01 Changed: Replaced some Mac OS X warnings by TODO comments 2014-03-27 16:36:00 +01:00
kervala
147acded5f Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
6ac3bd6954 Moved tag latest-default-graft to changeset 8162b598e9e2 (from changeset e4680cd1f1ce) 2014-03-28 19:42:43 +01:00
kervala
87060b8520 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kervala
28025c68a8 Fixed: Switch not handled warnings 2014-03-27 15:53:19 +01:00