mattraykowski
|
8438fdda44
|
merged default, resvolved conflicts.
--HG--
branch : gsoc2012-achievements
|
2012-10-17 10:00:28 -05:00 |
|
mattraykowski
|
92399cb5d2
|
merged from default
--HG--
branch : gsoc2012-achievements
|
2012-10-17 08:52:01 -05:00 |
|
kervala
|
d8c7fa52f9
|
Changed: Replaced string empty comparisons with empty()
|
2012-10-06 18:17:57 +02:00 |
|
kervala
|
3d50e0160d
|
Changed: #878 Fix typos in comments/code
|
2012-10-06 17:09:03 +02:00 |
|
kervala
|
7c4be0fb74
|
Changed: Synchronization with SVN
|
2012-10-05 20:37:15 +02:00 |
|
kervala
|
e4e12ff6c4
|
Changed: Synchronization with SVN
|
2012-10-05 14:57:05 +02:00 |
|
kervala
|
7a04e920e1
|
Fixed: #1493 MultiArch support
|
2012-09-22 22:57:38 +02:00 |
|
sfb
|
e48a8bd13e
|
Fixed: #1490 Added a 'no context' object in the createNamedItemInBag admin function.
|
2012-09-12 14:25:01 -05:00 |
|
kervala
|
e2237d3971
|
Changed: Reverted another previous fix (sorry again)
|
2012-09-11 23:15:56 +02:00 |
|
kervala
|
f3828a0b92
|
Changed: Synchronization with SVN
|
2012-09-11 21:49:37 +02:00 |
|
kervala
|
eea1360021
|
Changed: Synchronization with SVN
|
2012-09-11 21:39:30 +02:00 |
|
SirCotare
|
c96ff882cd
|
#1470 initial EGS with achievements
--HG--
branch : gsoc2012-achievements
|
2012-08-07 17:42:25 +02:00 |
|
kaetemi
|
c618a29276
|
Reverted: Unnecessary changes to config and data from merge
|
2012-06-04 15:03:40 +02:00 |
|
kaetemi
|
cab401fa13
|
Merged: From default to sound_dev
--HG--
branch : sound_dev
|
2012-06-02 11:09:14 +02:00 |
|
sfb
|
af454dd1cf
|
Fixed EOL issues and added .hgeol file.
|
2012-05-29 08:31:11 -05:00 |
|
Fabien_HENON
|
dd6f2f2611
|
Changed: #1469 Getting last version from default branch
--HG--
branch : gsoc2012-fabien
|
2012-05-26 21:38:30 +02:00 |
|
Fabien_HENON
|
f70bdc4032
|
Changed: #1469 StringId conversion to SheetId for sounds V2 (DOES NOT COMPILE YET)
--HG--
branch : gsoc2012-fabien
|
2012-05-26 19:21:19 +02:00 |
|
kervala
|
fa63a284c2
|
Fixed: #1474 Compilation with new MySQL headers
|
2012-05-24 12:56:53 +02:00 |
|
kervala
|
d27c9cfc69
|
Fixed: Compilation with new MySQL headers
|
2012-05-21 10:51:30 +02:00 |
|
kervala
|
78bc0fb0d7
|
Fixed: Compilation with new mysqlclient headers
|
2012-05-20 00:05:01 +02:00 |
|
kervala
|
52524f27fb
|
Changed: #878 Fix typos in comments/code
|
2012-05-14 13:08:44 +02:00 |
|
kervala
|
55f7150202
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-08 14:23:36 +02:00 |
|
kervala
|
36fcd706fa
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 23:47:55 +02:00 |
|
kervala
|
de9b4be9c6
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 22:30:39 +02:00 |
|
kervala
|
48e05d0056
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 20:04:08 +02:00 |
|
kervala
|
0ac33d338a
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 15:04:26 +02:00 |
|
kervala
|
cdcdc05e88
|
Fixed: #1448 Compilation with CLang
|
2012-04-07 14:57:15 +02:00 |
|
kaetemi
|
b1bfd3da01
|
Fixed: #1455 Bad changes in revision 48a37af6954c
|
2012-04-05 19:30:41 +02:00 |
|
sfb
|
e5cf9934e7
|
Fixed: #1455 VS10 isn't implicitly casting to CSString. Forcing it, which is probably more correct anyway.
|
2012-04-02 14:26:12 -05:00 |
|
sfb
|
5bbff4201d
|
merge inbound
|
2012-03-12 13:31:26 -05:00 |
|
sfb
|
66d5b0b879
|
Fixed: #1449 Added missing header, fixed CMake configuration, fixed iterators. GUS builds fine without MFC extensions.
|
2012-03-12 13:28:56 -05:00 |
|
kervala
|
35b2270fe8
|
Fixed: ryzom_servershare CMakeLists.txt typo
|
2012-03-10 13:08:13 +01:00 |
|
kaetemi
|
d0ff6b9c80
|
Fixed: Forgot to add the grouped files to the target thing
|
2012-03-09 18:26:53 +01:00 |
|
kaetemi
|
33842ea6ed
|
Changed: Some source file grouping in some projects
|
2012-03-09 11:30:31 +01:00 |
|
kervala
|
b40f9b933d
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-05 18:56:30 +01:00 |
|
kervala
|
b1ad39a21b
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-05 11:59:00 +01:00 |
|
kervala
|
6b293ca23a
|
Fixed: #1433 Merge changes from patch 1.13
|
2012-03-04 16:54:37 +01:00 |
|
kervala
|
247e920543
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-04 14:35:44 +01:00 |
|
kervala
|
e7a69b6950
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-04 14:01:11 +01:00 |
|
kervala
|
3c47b9f8d5
|
Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc...
|
2012-03-03 10:49:42 +01:00 |
|
sfb
|
d4e185c741
|
Changed: #1436 Enabled patchman build, fixed its CMakeLists added missing header includes, eliminated static-ness of extern'd functions.
|
2012-02-29 09:26:31 -06:00 |
|
Fabien_HENON
|
594d939c0b
|
#1304: Guild Missions: Merge with default
--HG--
branch : gsoc2011-guildmissions
|
2011-08-21 19:29:28 +02:00 |
|
Fabien_HENON
|
ff5da0aa22
|
Changed: #1304: Debug for the guild missions. Now it works !
--HG--
branch : gsoc2011-guildmissions
|
2011-08-04 17:04:49 +02:00 |
|
Fabien_HENON
|
1f057afe91
|
Changed: #1304: Message concerning the number of times a mission needs to be completed
--HG--
branch : gsoc2011-guildmissions
|
2011-07-25 14:09:13 +02:00 |
|
Fabien_HENON
|
6462021f14
|
Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members)
--HG--
branch : gsoc2011-guildmissions
|
2011-07-25 12:27:19 +02:00 |
|
Fabien_HENON
|
5762e00236
|
Changed: #1304: Implementation of the "guild" parameter for the "destroy_item" action
--HG--
branch : gsoc2011-guildmissions
|
2011-07-20 22:09:01 +02:00 |
|
Fabien_HENON
|
757f393db1
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_named_item" action
--HG--
branch : gsoc2011-guildmissions
|
2011-07-20 21:08:53 +02:00 |
|
Fabien_HENON
|
5ac224b5af
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_item" action
--HG--
branch : gsoc2011-guildmissions
|
2011-07-20 20:33:52 +02:00 |
|
Fabien_HENON
|
cb6b4ac917
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_fame" action
--HG--
branch : gsoc2011-guildmissions
|
2011-07-20 18:41:30 +02:00 |
|
Fabien_HENON
|
af4d2d6236
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_money" action
--HG--
branch : gsoc2011-guildmissions
|
2011-07-19 19:10:12 +02:00 |
|