mattraykowski
|
01cd3859ca
|
merged default, resvolved conflicts.
|
2012-10-17 10:00:28 -05:00 |
|
mattraykowski
|
1c8841eb57
|
merged from default
|
2012-10-17 08:52:01 -05:00 |
|
kervala
|
0698f1abc2
|
Changed: Replaced string empty comparisons with empty()
|
2012-10-06 18:17:57 +02:00 |
|
kervala
|
3a361f1c9a
|
Changed: #878 Fix typos in comments/code
|
2012-10-06 17:09:03 +02:00 |
|
kervala
|
e8b1eedc97
|
Changed: Synchronization with SVN
|
2012-10-05 14:57:05 +02:00 |
|
kervala
|
38c5e6840d
|
Fixed: #1493 MultiArch support
|
2012-09-22 22:57:38 +02:00 |
|
sfb
|
15dd01caf7
|
Fixed: #1490 Added a 'no context' object in the createNamedItemInBag admin function.
|
2012-09-12 14:25:01 -05:00 |
|
kervala
|
13c5b17e61
|
Changed: Reverted another previous fix (sorry again)
|
2012-09-11 23:15:56 +02:00 |
|
kervala
|
972a8d79a5
|
Changed: Synchronization with SVN
|
2012-09-11 21:49:37 +02:00 |
|
kervala
|
fc892c0424
|
Changed: Synchronization with SVN
|
2012-09-11 21:39:30 +02:00 |
|
SirCotare
|
c521b9e080
|
#1470 initial EGS with achievements
|
2012-08-07 17:42:25 +02:00 |
|
dfighter1985
|
e24cffa79f
|
Merged default branch into gui-refactoring.
|
2012-07-02 22:46:08 +02:00 |
|
sfb
|
2f9410f22d
|
Fixed EOL issues and added .hgeol file.
|
2012-05-29 08:31:11 -05:00 |
|
kervala
|
c48667fae9
|
Fixed: #1474 Compilation with new MySQL headers
|
2012-05-24 12:56:53 +02:00 |
|
kervala
|
587def6dbb
|
Fixed: Compilation with new MySQL headers
|
2012-05-21 10:51:30 +02:00 |
|
kervala
|
6e1400091e
|
Fixed: Compilation with new mysqlclient headers
|
2012-05-20 00:05:01 +02:00 |
|
kervala
|
ec2011ece5
|
Changed: #878 Fix typos in comments/code
|
2012-05-14 13:08:44 +02:00 |
|
dfighter1985
|
7e3c4aa15e
|
Moved xml auto pointer to nlmisc.
|
2012-04-16 02:50:18 +02:00 |
|
kervala
|
40fa6620bf
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-08 14:23:36 +02:00 |
|
kervala
|
bac5b8d084
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 23:47:55 +02:00 |
|
kervala
|
ed95d4ed79
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 22:30:39 +02:00 |
|
kervala
|
d3bb7e1062
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 20:04:08 +02:00 |
|
kervala
|
c441d086ce
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2012-04-07 15:04:26 +02:00 |
|
kervala
|
de5137d0f6
|
Fixed: #1448 Compilation with CLang
|
2012-04-07 14:57:15 +02:00 |
|
kaetemi
|
5add0ca372
|
Fixed: #1455 Bad changes in revision 48a37af6954c
|
2012-04-05 19:30:41 +02:00 |
|
sfb
|
3178cb6708
|
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
|
47eac5203e
|
merge inbound
|
2012-03-12 13:31:26 -05:00 |
|
sfb
|
3d7b89f77b
|
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
|
859f168dd0
|
Fixed: ryzom_servershare CMakeLists.txt typo
|
2012-03-10 13:08:13 +01:00 |
|
kaetemi
|
5cab75f13e
|
Fixed: Forgot to add the grouped files to the target thing
|
2012-03-09 18:26:53 +01:00 |
|
kaetemi
|
ec66027596
|
Changed: Some source file grouping in some projects
|
2012-03-09 11:30:31 +01:00 |
|
kervala
|
19fa9a35dc
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-05 18:56:30 +01:00 |
|
kervala
|
f5feca0430
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-05 11:59:00 +01:00 |
|
kervala
|
79c934520c
|
Fixed: #1433 Merge changes from patch 1.13
|
2012-03-04 16:54:37 +01:00 |
|
kervala
|
d403d24bb0
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-04 14:35:44 +01:00 |
|
kervala
|
71b7cb9ef0
|
Changed: #1433 Merge changes from patch 1.13
|
2012-03-04 14:01:11 +01:00 |
|
kervala
|
41551e3026
|
Fixed: #1441 Remove all remaining .vcproj, Makefiles, automake scripts, etc...
|
2012-03-03 10:49:42 +01:00 |
|
sfb
|
9a5d240163
|
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
|
95a5316a33
|
#1304: Guild Missions: Merge with default
|
2011-08-21 19:29:28 +02:00 |
|
Fabien_HENON
|
2afce02712
|
Changed: #1304: Debug for the guild missions. Now it works !
|
2011-08-04 17:04:49 +02:00 |
|
Fabien_HENON
|
27d920c495
|
Changed: #1304: Message concerning the number of times a mission needs to be completed
|
2011-07-25 14:09:13 +02:00 |
|
Fabien_HENON
|
12f624a7a5
|
Changed: #1304: Update of CMissionStepDoMissions to support missions done several times (by different guild members)
|
2011-07-25 12:27:19 +02:00 |
|
Fabien_HENON
|
72629b83b9
|
Changed: #1304: Implementation of the "guild" parameter for the "destroy_item" action
|
2011-07-20 22:09:01 +02:00 |
|
Fabien_HENON
|
2558e79ea1
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_named_item" action
|
2011-07-20 21:08:53 +02:00 |
|
Fabien_HENON
|
42adc7f469
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_item" action
|
2011-07-20 20:33:52 +02:00 |
|
Fabien_HENON
|
bc4ac5dac6
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_fame" action
|
2011-07-20 18:41:30 +02:00 |
|
Fabien_HENON
|
0feeb05359
|
Changed: #1304: Implementation of the "guild" parameter for the "recv_money" action
|
2011-07-19 19:10:12 +02:00 |
|
Fabien_HENON
|
310d027d2c
|
Changed: #1304: Parsing the "guild" parameter for the actions that need it.
|
2011-07-19 18:39:29 +02:00 |
|
Fabien_HENON
|
713f976748
|
Changed: #1304: Implementation of the cbClientGroupAbandonMission for the guilds
|
2011-07-18 19:37:59 +02:00 |
|
Fabien_HENON
|
d5b1fbd5b0
|
Changed: #1304: Add implementation of functions to process mission events for guild missions
|
2011-07-04 15:57:02 +02:00 |
|
Fabien_HENON
|
70b16fc877
|
Changed: #1304: Adding mission histories for CGuild
|
2011-07-04 15:06:11 +02:00 |
|
Fabien_HENON
|
46b592db13
|
Changed: #1304: Adding guild mission support in functions acceptExchange and processMissionEventList of the CCharacter class
|
2011-07-04 13:57:11 +02:00 |
|
Fabien_HENON
|
f41994dfff
|
Changed: #1304: Adding Guild mission support in function tickUpdate of CCharacter
|
2011-07-04 12:38:42 +02:00 |
|
Fabien_HENON
|
5955b44550
|
Changed: #1304: Implementation of basic CGuild functions for guild missions
|
2011-06-29 14:44:30 +02:00 |
|
Fabien_HENON
|
a369dbc942
|
Changed: #1304: Add guild missions prerequisites.
|
2011-06-20 16:08:12 +02:00 |
|
Fabien_HENON
|
3479178476
|
Changed: #1304: Instanciation of guild missions.
|
2011-06-20 15:15:07 +02:00 |
|
kervala
|
fad4a00075
|
Changed: #878 Fix typos in comments/code
|
2011-06-07 15:58:18 +02:00 |
|
Fabien_HENON
|
7264e6c1bf
|
Changed: #1304: Updating CMissionGuild for guild missions.
Implementation of the functions:
- updateUsersJournalEntry
- clearUsersJournalEntry
|
2011-06-07 14:42:00 +02:00 |
|
kervala
|
ec90234947
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-06-05 18:06:00 +02:00 |
|
kervala
|
73b6bee421
|
Changed: Replaced NLMISC::strlwr by NLMISC::toLower
|
2011-06-05 17:52:40 +02:00 |
|
kervala
|
787fffd092
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2011-06-04 13:25:58 +02:00 |
|
kervala
|
dc66068f94
|
Changed: Merge changes from next patch
|
2011-06-04 13:23:14 +02:00 |
|
kervala
|
900dc9e5da
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-06-03 10:51:03 +02:00 |
|
kervala
|
cbc41fb73a
|
Changed: Exceptions catched by reference
|
2011-06-03 10:42:40 +02:00 |
|
kervala
|
5b5a050616
|
Changed: Exceptions catched by reference
|
2011-06-03 10:35:25 +02:00 |
|
kervala
|
e896f53b6b
|
Changed: Exceptions catched by reference
|
2011-06-02 18:43:58 +02:00 |
|
kervala
|
540bc1f62f
|
Changed: Exceptions catched by reference
|
2011-06-02 18:31:40 +02:00 |
|
kervala
|
8d099d236a
|
Changed: Merge changes from next patch
|
2011-06-02 17:28:30 +02:00 |
|
kervala
|
5da70e5d9d
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-05-29 13:57:31 +02:00 |
|
kervala
|
fbec2565e9
|
Changed: Compilation with VC++ 2010 without STLport
|
2011-05-28 15:52:48 +02:00 |
|
kervala
|
785c5be8d8
|
Changed: #878 Fix typos in comments/code
|
2011-05-26 20:47:04 +02:00 |
|
kervala
|
30819b35a7
|
Changed: #1177 VS 2010 does not work under CMake
|
2011-05-26 16:18:38 +02:00 |
|
kervala
|
dd36396d72
|
Fixed: #1272 Compilation with GCC 4.6 (patch provided by Krop)
|
2011-05-24 13:46:40 +02:00 |
|
kervala
|
4d8038085c
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-05-24 13:40:23 +02:00 |
|
kervala
|
6058264aed
|
Changed: Renamed monitor_service to ryzom_monitor_service for homogeneity
|
2011-05-24 13:38:34 +02:00 |
|
kervala
|
570051bbbd
|
Changed: #1272 Fixed compilation with GCC 4.6 (patch provided by Naush)
|
2011-05-24 13:37:04 +02:00 |
|
kervala
|
0d4ed33812
|
Changed: #1272 Fixed gpm_service compilation with GCC 4.6 (and added PCH to project)
|
2011-05-24 10:54:17 +02:00 |
|
kervala
|
23f89c8d90
|
Changed: Merge changes from next patch
|
2011-05-31 22:16:29 +02:00 |
|
kervala
|
4aa2c68151
|
Changed: #878 Fix typos in comments/code
|
2011-05-31 22:16:17 +02:00 |
|
kervala
|
37cfa5a9f2
|
Changed: Merge changes from next patch
|
2011-05-31 21:51:26 +02:00 |
|
kervala
|
dec67309f3
|
Changed: #878 Fix typos in comments/code
|
2011-03-09 14:30:51 +01:00 |
|
kervala
|
6abf79f20e
|
Changed: Changes from last patch
|
2011-03-09 13:52:52 +01:00 |
|
kervala
|
84de30eb8f
|
Changed: Changes from next patch
|
2011-03-03 19:32:52 +01:00 |
|
kervala
|
3a51ef7f07
|
Fixed: #868 0:Invalid account (2101) error caused by Shard Unifier Service and MySQL (patch provided by kerozcak)
|
2011-02-28 13:54:00 +01:00 |
|
kervala
|
0b8820ca0c
|
Fixed: Compilation under Linux with STLport
|
2011-02-11 18:05:19 +01:00 |
|
kervala
|
d6ba3db1ad
|
Fixed: NPC merchants with type 'sale'
|
2011-02-09 14:36:30 +01:00 |
|
sfb
|
4103b2a033
|
Fixed: #1236 Applied PackPro's fix for the EGS crash in PD messages, using memcpy instead of casts into the union.
|
2011-01-18 12:43:31 -06:00 |
|
kervala
|
219dce25f2
|
Changed: #1016 entities_game_service segfault in ubuntu 64biten
|
2010-12-04 15:10:48 +01:00 |
|
kervala
|
e6d174778a
|
Changed: #1016 entities_game_service segfault in ubuntu 64biten
|
2010-12-03 15:18:39 +01:00 |
|
kervala
|
ba935324f6
|
Changed: #878 Fix typos in comments/code
|
2010-11-18 19:38:10 +01:00 |
|
kervala
|
0f7b988352
|
Changed: #878 Fix typos in comments/code
|
2010-11-13 18:33:01 +01:00 |
|
kervala
|
6362857850
|
Changed: #878 Fix typos in comments/code
|
2010-11-12 14:26:38 +01:00 |
|
kervala
|
243b0c5b3b
|
Changed: #878 Fix typos in comments/code
|
2010-11-02 21:49:34 +01:00 |
|
kervala
|
08386e0c28
|
Changed: #825 Remove all warning when compiling Ryzom
|
2010-10-30 14:20:26 +02:00 |
|
kervala
|
1e3dda8d38
|
Changed: #825 Remove all warning when compiling Ryzom
|
2010-10-23 19:49:03 +02:00 |
|
kervala
|
58ddc84100
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2010-10-23 18:00:04 +02:00 |
|
kervala
|
46ee8c173a
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2010-10-23 17:39:06 +02:00 |
|
kervala
|
b941df76c9
|
Changed: #1135 Merge changes from Ryzom patch 1.10
|
2010-10-23 17:12:00 +02:00 |
|
kervala
|
48dfc73ef0
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2010-10-23 17:11:21 +02:00 |
|
kervala
|
f8889fcec8
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2010-10-23 15:06:17 +02:00 |
|