Commit graph

3818 commits

Author SHA1 Message Date
kervala
8cb4428ff5 Default merge
--HG--
branch : compatibility
2014-04-24 23:01:54 +02:00
kervala
e84dd7b5f7 Changed: Replaced strlwr by toLower 2014-04-24 22:59:29 +02:00
kervala
31859175ba Backed out changeset: 79980ce60498 2014-04-24 19:31:53 +02:00
kervala
d18e6d8099 Fusion with compatibility 2014-04-24 19:26:05 +02:00
kervala
24fa8df5ff Fusion avec default
--HG--
branch : compatibility
2014-04-24 19:16:42 +02:00
Cédric OCHS
bcc22bb11c 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
b7bafa4f66 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
3fff8fe467 Changed: Replaced strlwr by toLower
--HG--
branch : compatibility
2014-04-24 18:11:16 +02:00
Nimetu
7cc1bf9f17 Fix compiling on linux with new OpenGL headers (issue #145)
--HG--
branch : Issue#145
2014-04-23 23:23:23 +03:00
Nimetu
02cb532401 Properly restore saved camera distance from config file (issue #130)
--HG--
branch : Issue#130
2014-04-23 23:20:13 +03:00
Matthew Lagoe
c7650f041a 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
db2f0435cd missing = 2014-04-21 03:03:39 -07:00
botanic
bac99a8815 fix for missing include 2014-04-21 03:00:19 -07:00
botanic
18f72e3781 php is_writable is not reliable 2014-04-21 02:39:29 -07:00
dfighter1985
b4a64d4c04 Merge gsoc2012-gui-editor. 2014-04-19 22:06:14 +02:00
dfighter1985
41f44b2aa6 Merge default.
--HG--
branch : gsoc2012-gui-editor
2014-04-19 21:53:29 +02:00
kervala
ed1a84c99b Changed: Updated OpenGL and OpenGL ES headers
--HG--
branch : compatibility
2014-04-17 10:44:03 +02:00
kervala
831758beb1 Fixed: nglXSwapIntervalEXT return type should be void
--HG--
branch : compatibility
2014-04-17 10:16:30 +02:00
kervala
5a88951837 Changed: Find DirectX libraries in alternative folders
--HG--
branch : compatibility
2014-04-11 17:56:26 +02:00
shubham_meena
1970dd0ff4 remove wrong panel from settings page
--HG--
branch : issue#119
2014-04-11 13:25:12 +05:30
botanic
4891ce5dc4 fix paths 2014-04-07 08:03:55 -07:00
botanic
fd4fce0d6a missing . 2014-04-07 06:39:41 -07:00
botanic
5fe1dd709f display erors on installer 2014-04-07 06:35:15 -07:00
botanic
fff4682d92 missed it on all of them 2014-04-07 06:29:44 -07:00
botanic
cd9deab467 Merge 2014-04-07 06:27:49 -07:00
botanic
08b1602e5a missed a ../ 2014-04-07 06:27:15 -07:00
Matthew Lagoe
0a631f5f9f 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
3f54b93b30 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
kaetemi
e494200c21 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00
kaetemi
562dae3c3f Add command to eternally trap players ingame 2014-04-01 13:52:36 +02:00
kaetemi
5ed5cd5ea8 Add interface for HMD with player death support 2014-04-01 13:14:44 +02:00
kervala
8f6c32bd69 Backed out changeset: 3937923211ec
--HG--
branch : compatibility
2014-03-29 12:45:22 +01:00
Jan Boon
2eacddc47c 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
6765d4f091 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
283f52a03f Merge 2014-03-28 19:50:21 +01:00
kaetemi
f88fc628e8 Moved tag latest-default-graft to changeset 5f0b297fb908 (from changeset 8162b598e9e2) 2014-03-28 19:43:30 +01:00
kervala
c83afd649d Changed: Replaced some Mac OS X warnings by TODO comments
--HG--
branch : compatibility
2014-03-27 16:36:00 +01:00
kervala
62eb6347e5 Changed: Aligned methods names 2014-03-27 16:34:55 +01:00
kaetemi
7fd14c23ad Moved tag latest-default-graft to changeset 8162b598e9e2 (from changeset e4680cd1f1ce) 2014-03-28 19:42:43 +01:00
kervala
8968124553 Changed: Aligned methods names
--HG--
branch : compatibility
2014-03-27 16:34:55 +01:00
kervala
81881a583f Fixed: Switch not handled warnings
--HG--
branch : compatibility
2014-03-27 15:53:19 +01:00
kervala
9f0daa9a1e Fixed: Wrong header guard warning 2014-03-27 15:51:20 +01:00
kervala
2e6ac0ad84 Fixed: Wrong header guard warning
--HG--
branch : compatibility
2014-03-27 15:51:20 +01:00
kervala
bfaf952f32 Fixed: Warnings with clang: wrong ! and == operators order 2014-03-27 15:50:58 +01:00
kervala
8fa24eeb4e Fixed: Warnings with clang: wrong ! and == operators order
--HG--
branch : compatibility
2014-03-27 15:50:58 +01:00
kervala
b8ad53adf3 Fixed: Typo detected by clang 2014-03-27 13:40:22 +01:00
kervala
79529b1581 Fixed: Typo detected by clang
--HG--
branch : compatibility
2014-03-27 13:40:22 +01:00
kervala
a0801ebffe Changed: Removed useless definitions 2014-03-27 13:39:46 +01:00
kervala
7ab7952dbd Changed: Removed useless definitions
--HG--
branch : compatibility
2014-03-27 13:39:46 +01:00
kervala
def5243d06 Changed: Updated OpenGL headers 2014-03-27 13:39:16 +01:00