Commit graph

3843 commits

Author SHA1 Message Date
kaetemi
47e5e587ad Use vector instead of map to store sbrick sheets, it's faster 2014-05-23 19:13:08 +02:00
kaetemi
4311da091f Add --admininstall parameter to c1_shard_patch 2014-05-23 17:25:52 +02:00
kaetemi
0a41e6b3c4 Fix Windows compilation of lightmap_optimizer 2014-05-23 01:57:19 +02:00
Cédric OCHS
f5dac14fd1 Merged in liria/khanat/lightmap_optimizer_port_to_linux (pull request #62)
Port of lightmap_optimizer to linux
2014-05-15 16:52:11 +02:00
liria
94b30c76fa Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
2014-05-15 16:36:59 +02:00
kervala
46e5c39e74 Changed: Replaced some spaces by tabulations 2014-05-13 09:29:45 +02:00
botanic
b57755b9ee Fix for bug from de6f606 2014-05-10 09:15:00 -07:00
kervala
d7c9608d83 Fixed: Compilation error 2014-05-09 19:18:56 +02:00
kaetemi
db1f8221c3 Added tag latest-merge-from-default for changeset 950d650ca92e 2014-04-30 13:07:12 +02:00
kaetemi
fe6c9d7ba2 Added tag latest-graft-to-default for changeset 950d650ca92e 2014-04-30 13:06:48 +02:00
kaetemi
699b9c365f Remove graft tag 2014-04-30 13:05:40 +02:00
kaetemi
db5c65fedf Merge 2014-04-30 12:57:54 +02:00
kaetemi
1a4a7bafab Backed out changeset: 897087f1fa71, 7c3f1f0dc9d8, 61d11f94e3ea 2014-04-30 12:54:20 +02:00
kaetemi
798d207d0d Fix EOL 2014-04-30 12:53:06 +02:00
kervala
060347f2b9 Changed: Small typo 2014-04-30 09:18:31 +02:00
kervala
50324ccd55 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
8972ecf1b3 Fixed: tmpFlagRemovedPatchCategories not needed anymore because RemovedPatchCategories defined in login_patch.cpp 2014-04-26 22:51:03 +02:00
sfb
c666176278 Modified the CTestConfig to point at the new CI server. 2014-04-25 14:00:46 -05:00
kervala
01bc4eeb92 Changed: Minor changes 2014-04-25 11:58:35 +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
liria
d89e6c9c2c Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-11 16:47:50 +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
liria
12f63f3a6e Typo correction
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 13:49:14 +00:00
liria
30036d000c Merged default into lightmap_optimizer_port_to_linux
--HG--
branch : lightmap_optimizer_port_to_linux
2014-04-05 15:40:17 +02:00
kaetemi
e494200c21 Bugfix: Kill users who attempt to escape the game 2014-04-01 13:54:39 +02:00