dfighter1985
|
fcb736c387
|
Merged mainline default branch changes.
--HG--
branch : gsoc2012-gui-editor
|
2013-02-14 10:47:10 +01:00 |
|
kervala
|
6eec6cb861
|
Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!)
|
2013-02-13 14:40:41 +01:00 |
|
kervala
|
f5dec3c1ca
|
Changed: Typo fixes and French comments translated to English (Thanks to DuDraig!)
|
2013-02-12 22:48:37 +01:00 |
|
mattraykowski
|
cd2134e671
|
merging
|
2013-02-12 10:28:20 -06:00 |
|
mattraykowski
|
8ced186cfd
|
merge from default
--HG--
branch : gsoc2012-achievements
|
2013-02-12 10:24:22 -06:00 |
|
kervala
|
671827225d
|
Changed: French comments translated to English
|
2013-02-11 22:24:48 +01:00 |
|
kervala
|
6e498aefad
|
Changed: Typo fixes (thanks to Vagrant!)
|
2013-02-09 10:05:32 +01:00 |
|
kervala
|
45c8b20f39
|
Changed: Typo fixes (thanks to Vagrant!)
|
2013-02-08 13:17:44 +01:00 |
|
mattraykowski
|
f370f767ef
|
fixes issue #9 - deleted the 'highres' graphvars from config files.
|
2013-02-01 13:09:53 -06:00 |
|
mattraykowski
|
6f64abe84a
|
fixes issue #8 - checks for RYZOM_PATH env var, starts in build folder and turns on status line display in screen.
|
2013-02-01 13:07:51 -06:00 |
|
kervala
|
b275536528
|
Changed: Included "fe_types.h"
|
2012-12-28 15:42:31 +01:00 |
|
kervala
|
16dc8db7ca
|
Changed: GCC warnings
|
2012-12-21 16:51:10 +01:00 |
|
kervala
|
e6036c3047
|
Changed: frontend_service PCH compilation
|
2012-12-21 16:47:34 +01:00 |
|
kervala
|
df5376cc2a
|
Changed: ai_service PCH compilation
|
2012-12-21 14:39:38 +01:00 |
|
kervala
|
681836f620
|
Fixed: Server side issues
|
2012-11-26 18:41:30 +01:00 |
|
dfighter1985
|
cb13ce46cd
|
MODIFIED: #1471 Merged mainline default to this branch.
--HG--
branch : gsoc2012-gui-editor
|
2012-11-25 05:22:40 +01:00 |
|
kervala
|
8be848dd2b
|
Fixed: Server side issues
|
2012-11-24 20:20:21 +01:00 |
|
kervala
|
11e88fed8f
|
Changed: Minor changes
|
2012-10-28 13:47:09 +01:00 |
|
kervala
|
b7be696848
|
Move all PACS headers in nel/include/pacs directory (fixes #2)
|
2012-10-28 11:55:21 +01:00 |
|
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 |
|
dfighter1985
|
d301c46c27
|
Merged default branch into gui-refactoring.
--HG--
branch : gui-refactoring
|
2012-07-02 22:46:08 +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 |
|
dfighter1985
|
29cde6e15b
|
Moved xml auto pointer to nlmisc.
--HG--
branch : cdb-refactoring
|
2012-04-16 02:50:18 +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 |
|
Fabien_HENON
|
2d1ce64c38
|
Changed: #1304: Parsing the "guild" parameter for the actions that need it.
--HG--
branch : gsoc2011-guildmissions
|
2011-07-19 18:39:29 +02:00 |
|
Fabien_HENON
|
875d46f9b5
|
Changed: #1304: Implementation of the cbClientGroupAbandonMission for the guilds
--HG--
branch : gsoc2011-guildmissions
|
2011-07-18 19:37:59 +02:00 |
|
Fabien_HENON
|
e46422c041
|
Changed: #1304: Add implementation of functions to process mission events for guild missions
--HG--
branch : gsoc2011-guildmissions
|
2011-07-04 15:57:02 +02:00 |
|
Fabien_HENON
|
e92762ad8b
|
Changed: #1304: Adding mission histories for CGuild
--HG--
branch : gsoc2011-guildmissions
|
2011-07-04 15:06:11 +02:00 |
|
Fabien_HENON
|
74a6cc26e6
|
Changed: #1304: Adding guild mission support in functions acceptExchange and processMissionEventList of the CCharacter class
--HG--
branch : gsoc2011-guildmissions
|
2011-07-04 13:57:11 +02:00 |
|
Fabien_HENON
|
c175338c7f
|
Changed: #1304: Adding Guild mission support in function tickUpdate of CCharacter
--HG--
branch : gsoc2011-guildmissions
|
2011-07-04 12:38:42 +02:00 |
|
Fabien_HENON
|
19cfe26032
|
Changed: #1304: Implementation of basic CGuild functions for guild missions
--HG--
branch : gsoc2011-guildmissions
|
2011-06-29 14:44:30 +02:00 |
|
Fabien_HENON
|
a7f4bfa718
|
Changed: #1304: Add guild missions prerequisites.
--HG--
branch : gsoc2011-guildmissions
|
2011-06-20 16:08:12 +02:00 |
|
Fabien_HENON
|
ef009ebc90
|
Changed: #1304: Instanciation of guild missions.
--HG--
branch : gsoc2011-guildmissions
|
2011-06-20 15:15:07 +02:00 |
|
kervala
|
4ab971d2fe
|
Changed: #878 Fix typos in comments/code
|
2011-06-07 15:58:18 +02:00 |
|
Fabien_HENON
|
c4d39b2f98
|
Changed: #1304: Updating CMissionGuild for guild missions.
Implementation of the functions:
- updateUsersJournalEntry
- clearUsersJournalEntry
--HG--
branch : gsoc2011-guildmissions
|
2011-06-07 14:42:00 +02:00 |
|
kervala
|
4027e82360
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-06-05 18:06:00 +02:00 |
|
kervala
|
5cd98b6e45
|
Changed: Replaced NLMISC::strlwr by NLMISC::toLower
|
2011-06-05 17:52:40 +02:00 |
|
kervala
|
2a3e170bee
|
Changed: #142 Replace atoi and sscanf by fromString when it's possible
|
2011-06-04 13:25:58 +02:00 |
|
kervala
|
8350856a05
|
Changed: Merge changes from next patch
|
2011-06-04 13:23:14 +02:00 |
|
kervala
|
16460bcf97
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-06-03 10:51:03 +02:00 |
|
kervala
|
7a081ca8b5
|
Changed: Exceptions catched by reference
|
2011-06-03 10:42:40 +02:00 |
|
kervala
|
7c27c233eb
|
Changed: Exceptions catched by reference
|
2011-06-03 10:35:25 +02:00 |
|
kervala
|
1312ede370
|
Changed: Exceptions catched by reference
|
2011-06-02 18:43:58 +02:00 |
|
kervala
|
f9cc842b82
|
Changed: Exceptions catched by reference
|
2011-06-02 18:31:40 +02:00 |
|
kervala
|
2d80b547fc
|
Changed: Merge changes from next patch
|
2011-06-02 17:28:30 +02:00 |
|
kervala
|
bf23d8c3a4
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-05-29 13:57:31 +02:00 |
|
kervala
|
8208ec219b
|
Changed: Compilation with VC++ 2010 without STLport
|
2011-05-28 15:52:48 +02:00 |
|
kervala
|
2efa01d373
|
Changed: #878 Fix typos in comments/code
|
2011-05-26 20:47:04 +02:00 |
|
kervala
|
e909556883
|
Changed: #1177 VS 2010 does not work under CMake
|
2011-05-26 16:18:38 +02:00 |
|
kervala
|
eab2812a63
|
Fixed: #1272 Compilation with GCC 4.6 (patch provided by Krop)
|
2011-05-24 13:46:40 +02:00 |
|
kervala
|
0831b95502
|
Changed: #825 Remove all warnings when compiling Ryzom
|
2011-05-24 13:40:23 +02:00 |
|
kervala
|
53b8976e80
|
Changed: Renamed monitor_service to ryzom_monitor_service for homogeneity
|
2011-05-24 13:38:34 +02:00 |
|
kervala
|
abdd31fa8c
|
Changed: #1272 Fixed compilation with GCC 4.6 (patch provided by Naush)
|
2011-05-24 13:37:04 +02:00 |
|