Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
2744 commits 14 branches 1 tag 255 MiB
Commit graph

1137 commits

Author SHA1 Message Date
dfighter1985
07b5992f94 Moved some Lua related string formatting methods from CInterfaceManager to 
LuaHelperStuff namespace.

--HG--
branch : gui-refactoring
 2012-05-19 00:00:09 +02:00
dfighter1985
e694c62fdc FIXED: Crash caused by CInterfaceLinkUpdater trying to remove itself after CInterfaceManager had been released. 
--HG--
branch : gui-refactoring
 2012-05-17 03:38:27 +02:00
dfighter1985
b7feaa83cb Refactored the CEvent -> CEventDescriptor code in CInputHandlerManager. Extracted it as a new class CInputHandler, and moved some of it to CInterfaceManager. 
--HG--
branch : gui-refactoring
 2012-05-17 03:28:50 +02:00
kervala
30f83a5097 Changed: #878 Fix typos in comments/code 2012-05-14 13:32:06 +02:00
kervala
d9f32be674 Fixed: Crash when suri is empty 2012-05-14 13:30:41 +02:00
kervala
52524f27fb Changed: #878 Fix typos in comments/code 2012-05-14 13:08:44 +02:00
kervala
2c27caef09 Changed: #1275 Enable OpenGL ES driver in Ryzom client 2012-05-13 17:14:34 +02:00
dfighter1985
4996705ed7 Moved event descriptors under the NLGUI namespace. 
--HG--
branch : gui-refactoring
 2012-05-10 23:31:39 +02:00
dfighter1985
aed979a7fe Created NELGUI library, moved the GUI event descriptors there. 
--HG--
branch : gui-refactoring
 2012-05-10 22:17:04 +02:00
sfb
1fdaa8155b Fixed: #1374 Rolled back a const-ness change and tested connecting to Ring successfully. 2012-05-10 08:06:19 -05:00
kervala
e17fb8e2de Added: Mac OS X resources 2012-05-07 10:30:37 +02:00
kervala
421c6482d9 Changed: Set CMAKE_OSX_DEPLOYMENT_TARGET if not defined 
Changed: Use custom Info.plist
Added: RYZOM_DATA_DIR option to copy data from there
 2012-05-07 10:30:24 +02:00
kervala
aa9d2bfe8b Fixed: Compilation using WITH_STATIC_EXTERNAL under Mac OS X 2012-05-06 21:50:44 +02:00
vl
f333236a6b Merge 2012-05-04 12:08:04 +02:00
dfighter1985
d127d59807 Merging cdb-refactoring into gui-refactoring. 
--HG--
branch : gui-refactoring
 2012-04-28 21:36:39 +02:00
dfighter1985
10f7241449 Added new class CCDBManager, which encapsulates the separate CDB components into a easily (re)usable database solution. Also made CCDBSynchronized and CInterfaceManager use it. 
--HG--
branch : cdb-refactoring
 2012-04-27 22:49:38 +02:00
dfighter1985
982c57b70f Refactored the static branch observing code into a new class CCDBBranchObservingHandler. The CDB system *should* be fully reusable now! 
--HG--
branch : cdb-refactoring
 2012-04-22 06:45:35 +02:00
dfighter1985
decc92e75d Extracted the CDB bank handling code into a new class CCDBBankHandler, the CDB system should be now totally independent of Ryzom. 
--HG--
branch : cdb-refactoring
 2012-04-17 08:23:02 +02:00
dfighter1985
17eab4ef52 CDB is now part of NLMISC. However it still requires some work! 
--HG--
branch : cdb-refactoring
 2012-04-16 06:08:12 +02:00
dfighter1985
29cde6e15b Moved xml auto pointer to nlmisc. 
--HG--
branch : cdb-refactoring
 2012-04-16 02:50:18 +02:00
dfighter1985
0b3eec581d CDB no longer depends on Ryzom database banks. 
--HG--
branch : cdb-refactoring
 2012-04-16 02:18:07 +02:00
dfighter1985
634739af81 CDB no longer depends on CInterfaceLink. 
--HG--
branch : cdb-refactoring
 2012-04-16 01:31:21 +02:00
kaetemi
e611666391 Fixed: Warnings 2012-04-13 23:29:18 +02:00
kaetemi
def7d31721 Merge 2012-04-13 11:59:56 +02:00
kaetemi
cdb719130f Changed: #1459 Simplify the sound group controller interface 2012-04-13 11:54:20 +02:00
kervala
1b6c957c81 Changed: #825 Remove all warnings when compiling Ryzom 2012-04-13 09:36:51 +02:00
kaetemi
ac948b8a53 Changed: #1461 Bad minimum value for comparing fast swim speed causes random switching between fast and slow swim speed particle effects 2012-04-13 03:06:52 +02:00
kaetemi
41968b0674 Fixed: Compile error 
--HG--
branch : sound_dev
 2012-04-11 21:49:25 +02:00
kaetemi
18f75a4bd0 Changed: #1459 Use effects group controller for ryzom client effects volume control 
--HG--
branch : sound_dev
 2012-04-11 11:24:48 +02:00
kaetemi
7a95fae1f9 Changed: Improve performance of ryzom client CSoundManager. Strange code, though. 
--HG--
branch : sound_dev
 2012-04-11 00:48:47 +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
kervala
18ea4f8004 Changed: Check for Lua, Luabind, CURL and LibWWW only if compiling the client 2012-04-07 14:03:50 +02:00
kervala
6c768a144a Changed: #1448 Compilation with CLang 2012-04-07 11:51:21 +02:00
kervala
425927cd50 Changed: #1448 Compilation with CLang (patch provided by GelluleX, thanks !) 2012-04-07 11:14:21 +02:00
kaetemi
b1bfd3da01 Fixed: #1455 Bad changes in revision 48a37af6954c 2012-04-05 19:30:41 +02:00
kaetemi
fab5ddfd74 Fixed: Compile errors under Linux. 2012-04-05 17:45:53 +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
e2b2b8ffca Fixed: #1378 Imported nimetu's WebIG reference implementation. 2012-03-22 15:48:13 -05:00
sfb
4c2a3b6801 Fixed: #1414 Copied index.ctp to listdir.ctp and admin_index.ctp to eliminate symlinks. 2012-03-22 15:18:17 -05:00
sfb
a3ca1d10bc Changed: #1414 Removing symlinks. 2012-03-22 15:17:12 -05:00
sfb
1279aa5d3a merge from default 
--HG--
branch : gsoc2011-kerozcak
 2012-03-22 14:31:07 -05:00
kervala
a840c0fa56 Changed: #878 Fix typos in comments/code 2012-03-17 15:01:27 +01:00
kervala
1af368b7e4 Changed: #1433 Merge changes from patch 1.13 2012-03-17 15:00:24 +01:00
dfighter1985
28e3393dce Translation files are now embedded into the binary, also made the source groups a bit more sane. 
--HG--
branch : client_config_qt
 2012-03-16 17:35:37 +01:00
dfighter1985
9796bc02b2 The Qt Ryzom client configuration tool can now be built with CMake! 
--HG--
branch : client_config_qt
 2012-03-16 04:34:16 +01:00
dfighter1985
fd516bcf82 Adding the Qt client config tool files from the other repo. 
--HG--
branch : client_config_qt
 2012-03-16 00:50:04 +01: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
sfb
ade9ab1689 Fixed: #1436 Fixed license header for deployment_configuration files - PMS should be building fine now. 2012-03-12 13:26:13 -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
kervala
346920f1fd Merge 2012-03-09 13:06:52 +01:00
kervala
b27b2a0817 Changed: #1433 Merge changes from patch 1.13 (patch provided by Molator) 2012-03-09 13:03:47 +01:00
kaetemi
33842ea6ed Changed: Some source file grouping in some projects 2012-03-09 11:30:31 +01:00
kervala
d5731ad5ea Changed: #1433 Merge changes from patch 1.13 2012-03-08 16:59:03 +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
ea0804b153 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:11:28 +01:00
kervala
01a3479288 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:09:23 +01:00
kervala
f179ef28b1 Changed: #1433 Merge changes from patch 1.13 2012-03-04 14:06:07 +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
kervala
5c458d4c65 Fixed: Compilation under Mac OS X 2012-02-29 23:12:07 +01:00
sfb
acc6ce1b59 merge 2012-02-29 09:33:05 -06:00
sfb
efa4fbdbf1 merge 2012-02-29 09:32:53 -06: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
sfb
a00d451e09 Added: #1436 Missing deployment_configuration.cpp/h files. 2012-02-29 09:24:49 -06:00
kaetemi
93d3a4fea4 Fixed: Use $_POST and $_GET instead of deprecated $HTTP_GET_VARS and $HTTP_POST_VARS in the admin tool. 2012-02-29 13:10:59 +01:00
kervala
a09943f1f0 Changed: #1433 Merge changes from patch 1.13 2012-02-27 23:48:36 +01:00
kervala
6c43baaa1c Changed: #1433 Merge changes from patch 1.13 2012-02-27 22:42:30 +01:00
kervala
86eaabd0a2 Changed: #1433 Merge changes from patch 1.13 2012-02-27 16:10:47 +01:00
kervala
457704b2b6 Changed: #1433 Merge changes from patch 1.13 2012-02-27 15:04:33 +01:00
kervala
dd05742f88 Fixed: Bad check in emote tokens 2012-02-13 11:31:28 +01:00
dfighter1985
b4eae771e2 Moved an action handler, from the view manager's source to the game action handlers' source. 
--HG--
branch : gui-refactoring
 2012-02-13 02:30:26 +01:00
dfighter1985
546799874e We might as well load the input config when we initialize the input handler. 
--HG--
branch : gui-refactoring
 2012-02-12 02:18:00 +01:00
dfighter1985
364c8c493e FIXED: CInterfaceManager will no longer be prematurely released while quitting. 
--HG--
branch : gui-refactoring
 2012-02-11 23:47:54 +01:00
dfighter1985
0ee882f9f1 CInterfaceManager no longer depends on Driver global variable. 
--HG--
branch : gui-refactoring
 2012-02-11 23:44:55 +01:00
dfighter1985
598ab0b6dc CInterfaceManager and CViewText will no longer depend on the TextContext global variable. 
--HG--
branch : gui-refactoring
 2012-02-11 04:19:31 +01:00
dfighter1985
8c5b47f979 VCiewRenderer no longer depends on the global TextContext variable. Instead it's updated when it changes. 
--HG--
branch : gui-refactoring
 2012-02-11 02:28:14 +01:00
dfighter1985
c27ad72de6 CViewRenderer no longer depends on the Driver global variable. Also got rid of the same dependencies in files which included that global from the CViewRenderer header. 
--HG--
branch : gui-refactoring
 2012-02-11 01:41:46 +01:00
dfighter1985
38f215735c Seems I forgot to remove these.. 
--HG--
branch : gui-refactoring
 2012-02-08 20:27:43 +01:00
dfighter
b127966ffc Moved xml_auto_ptr from game_share to nel misc. 
--HG--
branch : gui-refactoring
 2012-02-08 01:58:15 +01:00
kervala
6a6115061c Fixed: #1420 Client patcher compilation under Mac OS X 2012-01-10 10:19:52 +01:00
kervala
15fa0b67f7 Fixed: ryzom_client_patcher missing file 2012-01-07 19:14:24 +01:00
kervala
2014543ec1 Fixed: Missing "stdpch.h" include 2012-01-02 15:53:21 +01:00
sfb
acbd3bd2c5 merge 2011-12-21 09:50:08 -06:00
sfb
45c720b874 Fixed: #1334 Applied Ulukyn's patch. Adds two new config variables - WebIgMainDomain and WebIgTrustedDomains. 2011-12-21 09:49:30 -06:00
sfb
7c3522da9e Fixed: #1385 patch_gen uses tmpnam function instead of 'nul' for files with no pre-existing version. Note - used tmpnam instead of mkstemp due to cross-platform compatibility. 2011-12-12 14:38:41 -06:00
kaetemi
3fc7b8abb9 Added: Default cfg values for textures interfaces. 2011-11-12 13:40:44 +01:00
kaetemi
d0a628a444 Fixed: Errors when using the database xslt using msxsl. 2011-10-31 13:48:43 +01:00
kervala
fbf81fc0b9 Fixed: #1380 pdr_util, -o command line option (patch provided by nimetu) 2011-10-21 11:34:58 +02:00
kervala
2e1a4591b2 Changed: Use all existing icons for Ryzom 2011-10-08 11:13:38 +02:00
kaetemi
8c92768c98 Changed: #1093 Build pacs prim list to correct location. 2011-09-28 09:49:16 +02:00
kaetemi
83e79fa761 Changed: #1093 Move the visual_slot.tab to the right place after running sheets packer. 2011-09-26 22:10:48 +02:00
kaetemi
4040f56691 Removed: Visual slot file should not be in repository. It is built by the sheets packer. 2011-09-26 21:47:56 +02:00
kaetemi
ab4468c48f Changed: #28 Clean comments 2011-09-23 00:20:20 +02:00
kaetemi
3346764013 Fixed: #1364 Only transfer bonus item infos when context help string is used for tooltip 2011-09-23 00:14:51 +02:00
kaetemi
9501c90654 Added: Leveldesign sheets required for building client sheets used for newbieland. 2011-09-21 23:38:40 +02:00
kaetemi
5a5304f823 Changed: #1093 Added generic helmets directory to export shape sources. 2011-09-21 23:17:39 +02:00
kaetemi
cf560a4898 Added: Missing plant and flora sheets required for building newbieland continent. 2011-09-20 18:11:12 +02:00
kaetemi
9956eec019 Added: Missing mode2animset.string_array 2011-09-20 16:19:59 +02:00
kaetemi
7b033676cb Added: #1093 Missing panoply_generique.cfg file. 2011-09-17 15:58:17 +02:00
kaetemi
3a520e2fb8 Changed: #1093 Also try ryzom_client_r.exe instead of client_ryzom_r.exe for copying exedll bnp... 2011-09-16 13:57:13 +02:00
kervala
54bfe9aff4 Changed: Replaced 32x32 pixmap by a 48x48 one 2011-09-11 16:41:16 +02:00
kervala
6306833423 Changed: New option WITH_INSTALL_LIBRARIES which allows user to install only final binaries and no development files (header, static libraries, etc...) 2011-09-11 14:44:37 +02:00
Fabien_HENON
594d939c0b #1304: Guild Missions: Merge with default 
--HG--
branch : gsoc2011-guildmissions
 2011-08-21 19:29:28 +02:00
kerozcak
89fd0e92c0 Changed: #1315 
--HG--
branch : gsoc2011-kerozcak
 2011-08-21 02:54:22 +02:00
Fabien_HENON
55e1452fe1 Changed: #1304: Updating world_editor documentation. Adding a primitive for guild missions 
--HG--
branch : gsoc2011-guildmissions
 2011-08-14 19:39:35 +02:00
kervala
55f26e7f16 Fixed: Icons name 2011-08-14 16:05:47 +02:00
kervala
84fd111146 Fixed: Icons path 2011-08-14 14:15:20 +02:00
kervala
80983a5ab6 Added: Hicolor and XPM icons for GNU/Linux 2011-08-14 11:47:34 +02:00
kervala
1ef3c1fada Removed: Backup files 2011-08-13 17:39:55 +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
78dbefb759 Changed: #1304: Checks in the mission compiler if the do_mission objective is correct (for a guild mission) when we add a number (the number of members from the guild needed to complete the mission) after a mission name 
--HG--
branch : gsoc2011-guildmissions
 2011-07-23 18:14:31 +02:00
Fabien_HENON
9f05d66a81 Changed: #1304: Revert modifications for the objectives in the mission compiler (i changed the way i will do it) 
--HG--
branch : gsoc2011-guildmissions
 2011-07-23 15:56:32 +02:00
Fabien_HENON
12fe8693d5 Changed: #1304: Revert modifications for the objectives in the world_editor_classes.xml (i changed the way i will do it) 
--HG--
branch : gsoc2011-guildmissions
 2011-07-23 15:51:46 +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
kerozcak
ccf80ff9d3 Changed: #1315 Added files forgotten to track. 
--HG--
branch : gsoc2011-kerozcak
 2011-07-20 12:21:20 +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
185603b5e6 Changed: #1304: Debug of the options added in the script (';' replaced by ':' for parameters separation) 
--HG--
branch : gsoc2011-guildmissions
 2011-07-19 18:10:28 +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
kerozcak
660ab4a153 merge from default 
--HG--
branch : gsoc2011-kerozcak
 2011-07-14 17:17:29 +02:00
kerozcak
0055bd7c4e Changed: #1315 Update. 
--HG--
branch : gsoc2011-kerozcak
 2011-07-14 16:49:25 +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
68ab06f7c0 Changed: Updated client_default.cfg.in from client_default.cfg 2011-06-14 20:11:44 +02:00
kervala
d52dead6af Changed: Merge changes from next patch 2011-06-14 19:34:28 +02:00
kervala
7adc1ec629 Changed: #878 Fix typos in comments/code 2011-06-14 19:31:59 +02:00
kerozcak
4d7293d0f5 Changed: #1315 Adding work i have done so far. 
--HG--
branch : gsoc2011-kerozcak
 2011-06-09 18:23:29 +02:00
kerozcak
c45be93014 Changed: #1315 Adding CakePHP app structure. 
--HG--
branch : gsoc2011-kerozcak
 2011-06-09 17:53:42 +02:00
kerozcak
87fed6cd85 merge from default 
--HG--
branch : gsoc2011-kerozcak
 2011-06-09 17:52:42 +02:00
kerozcak
471f5100e2 Changed: #1315 Directory name changed. 
--HG--
branch : gsoc2011-kerozcak
 2011-06-09 17:51:49 +02:00
vl
0e3465b6a1 Changed: chapter 5 2011-06-09 00:36:58 +02:00
vl
529edfcb9a Fixed: must not be lowered or the tooltip in milkopad doesn't work 2011-06-08 18:36:27 +02:00
kervala
0f63f56969 Changed: Replaced NLMISC::strlwr by NLMISC::toLower 2011-06-08 10:15:16 +02:00
kervala
e4fba623dc Fixed: Bad font default size 2011-06-08 10:14:48 +02:00
kervala
81d2817c44 Changed: #878 Fix typos in comments/code 2011-06-08 10:14:14 +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
f0f64cab63 Changed: Merge changes from next patch 2011-06-04 14:20:01 +02:00
kervala
f03da8e338 Changed: #878 Fix typos in comments/code 2011-06-04 13:48:27 +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
714bb3aa3b Changed: #878 Fix typos in comments/code 2011-06-03 15:17:23 +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
d4a78b6fd1 Changed: Merge changes from next patch 2011-06-02 17:26:04 +02:00
Fabien_HENON
91fef65450 Changed: #1304: mission_compiler actions: add new ones, check and script generation 
Add 2 new actions for the mission compiler: recv_charge_point and
give_control.
Add the 'guild' option for some actions: check if the mission is
valid, and change the script generation to add this option.

--HG--
branch : gsoc2011-guildmissions
 2011-05-31 22:00:27 +02:00
Fabien_HENON
bab4b3af21 Changed: #1304: mission_compiler objectives: check and script generation 
mission compiler now checks if we are not asking several guild
members to complete an objective whereas the mission is not a
guild mission.
It also generates the 'nb_guild_members_needed' parameter for
objectives in the script.

--HG--
branch : gsoc2011-guildmissions
 2011-05-31 16:22:57 +02:00
kervala
437657af2d Merge with gsoc2011-guildmissions 2011-05-30 13:33:07 +02:00
kervala
d245af6529 Changed: #878 Added new actions comments for translation_tools 2011-05-30 13:31:18 +02:00
Fabien_HENON
5fc9d23984 Merge 
--HG--
branch : gsoc2011-guildmissions
 2011-05-30 12:01:24 +02:00
sfb
2039038973 merge 2011-05-29 14:09:15 -05:00
sfb
977a6a7fd0 Changed: Applied patch fixing the mission_compiler_lib build under Linux 2011-05-29 14:08:46 -05: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
697f8760b2 Added: CMake project for mission_compiler_fe 2011-05-26 18:21:06 +02:00
kervala
09f1eba8dc Added: CMake project for mission_compiler_lib 2011-05-26 18:08:04 +02:00
kervala
e909556883 Changed: #1177 VS 2010 does not work under CMake 2011-05-26 16:18:38 +02:00
kervala
d8c73a8772 Changed: Use static_assert in nlctassert macro if C++0X is supported by compiler 2011-05-26 16:14:45 +02:00
kervala
db57bd0c11 Changed: #825 Remove all warnings when compiling Ryzom 2011-05-26 16:07:35 +02:00
kervala
9008bb14ef Changed: Merge changes from next patch 2011-05-26 16:06:21 +02:00
kervala
0c69122378 Changed: Merge changes from next patch 2011-05-26 14:33:04 +02:00
kervala
ddc0180e74 Changed: Merge changes from next patch 2011-05-26 14:16:13 +02:00
rti
002af69d22 Fixed: crash when using SelectCharacter = [0,4] (thanks ace) 2011-05-25 16:52:52 +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
kervala
14622fdf7d Changed: #1272 Fixed gpm_service compilation with GCC 4.6 (and added PCH to project) 2011-05-24 10:54:17 +02:00
Fabien_HENON
aa4a3391e8 Updating the world_editor_classes.xml file for the guild missions 
- Adding new actions for guild missions
- Adding the guild option for some actions
- Adding the nb_guild_members_needed option for the objectives

--HG--
branch : gsoc2011-guildmissions
 2011-05-23 16:09:14 +02:00
kervala
2e4b7777bd Fixed: #1177 VS 2010 does not work under CMake 2011-05-12 12:49:17 +02:00
dnk-88
87a197cba5 Changed: Added preview particle system in geqt. 2011-05-08 01:11:10 +03:00
dnk-88
c4ce6dcdcc Fixed: geqt correctly handles in the FileOpenDialog of cancel action and empty icon 2011-05-07 18:23:23 +03:00
dnk-88
a3d7d31bad Header cascading section resizes is enabled. 2011-05-07 15:51:15 +03:00
Piotr Kaczmarek
f4cad3ea00 add web-based translation tool directory 
--HG--
branch : gsoc2011-kerozcak
 2011-04-29 21:40:17 +02:00
kervala
2c1cc5cbee Changed: Merge changes from next patch 2011-05-31 22:16:29 +02:00
kervala
73bf79340d Changed: #878 Fix typos in comments/code 2011-05-31 22:16:17 +02:00
kervala
89197ae54f Changed: Merge changes from next patch 2011-05-31 21:51:26 +02:00
rti
cd61e1531a merge 2011-05-31 18:12:25 +02:00
rti
1457deeb5e Fixed: #1006 On Mac OS X, do glFinish() after vertex program upload to ensure program is ready to use. 2011-05-31 18:10:32 +02:00
rti
31e9d7cc28 Fixed: Compilation with GCC 4.6 2011-04-12 17:15:35 +02:00
rti
33d45c3ca8 Fixed: Compilation with GCC 4.6 2011-04-11 17:16:00 +02:00
rti
6284c481b4 Fixed: Compilation with GCC 4.6 2011-04-11 17:12:48 +02:00
kervala
5ef788bbfb Changed: Changes from last patch 2011-03-31 22:20:16 +02:00
kervala
c01c622076 Fixed: Compilation with GCC 4.6 2011-03-29 17:38:25 +02:00
kervala
47ebe49fbd Fixed: Compilation with GCC 4.6 2011-03-29 16:20:00 +02:00
kervala
f4040f6c1b Changed: Changes from last patch 2011-03-11 18:40:06 +01:00
kervala
3fd9f30695 Changed: #825 Remove all warnings when compiling Ryzom 2011-03-10 23:22:27 +01:00
rti
02949cbf84 Fixed: GEQT build on gcc 2011-03-10 00:54:37 +01:00
kervala
5baccb8b54 Changed: #878 Fix typos in comments/code 2011-03-09 14:30:51 +01:00
kervala
72992ee877 Changed: Changes from last patch 2011-03-09 14:23:57 +01:00
kervala
0d159da185 Changed: Changes from last patch 2011-03-09 13:52:52 +01:00
kervala
cb73ccd99a Changed: #878 Fix typos in comments/code 2011-03-09 13:46:52 +01:00
kervala
0f5605e537 Changed: Changes from last patch 2011-03-09 13:40:44 +01:00
kervala
dc5b3628ec Changed: #878 Fix typos in comments/code 2011-03-09 13:28:01 +01:00
aquiles
553f11d111 Changed: #1150 Added splash screen & new dialog + minor changes 2011-03-04 20:52:53 +01:00
kervala
364f7fddff Changed: Changes from next patch 2011-03-03 19:32:52 +01:00
kervala
3360af02b0 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
aquiles
8504c5a72a Changed: #1150 Moved private headers 2011-02-18 21:27:31 +01:00
vl
649756b3a2 Fixed: lookup the cert file 2011-02-18 09:44:40 +01:00
vl
d4452538cb Changed: make the in game creation account working 2011-02-18 09:02:47 +01:00
vl
e8c6bc896a Changed: Merge 2011-02-14 18:04:46 +01:00
vl
a91c6ea0a8 Changed: use bundle resource if default cfg is not found 2011-02-14 18:03:49 +01:00
vl
7659ba10f5 Changed: disabled veget on mac since it crash 2011-02-14 18:03:35 +01:00
kervala
56dc241c3d Fixed: Compilation under Linux with STLport 2011-02-11 18:05:19 +01:00
kervala
e9023e9a49 Changed: #878 Fix typos in comments/code 2011-02-09 14:42:30 +01:00
kervala
6881ee0ec2 Changed: #825 Remove all warnings when compiling Ryzom 2011-02-09 14:42:03 +01:00
kervala
558abd0470 Fixed: NPC merchants with type 'sale' 2011-02-09 14:36:30 +01:00
kervala
84b99dbbcc Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:56:55 +01:00
kervala
51d09f375a Changed: #1249 Endianness problems while access to disk or memory 2011-02-01 18:29:03 +01:00
kervala
fc1deec2e8 Changed: #1246 Build on PPC machines (patch provided by Jeru) 2011-01-30 15:48:02 +01:00
sfb
6b8b28b908 merge 2011-01-18 12:45:20 -06:00
sfb
5636c930a5 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
9100d0216b Changed: #1230 Reverted ryzom.world 2011-01-17 15:15:54 +01:00
kervala
c7bffec6ae Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-16 15:57:55 +01:00
kervala
807f26ffec Fixed: Compilation under Linux 2011-01-14 17:00:39 +01:00
kervala
5b4e12448f Fixed: Compilation under Linux 2011-01-14 16:23:22 +01:00
kervala
8278931800 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 14:24:43 +01:00
kervala
683721e943 Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-11 13:50:32 +01:00
kervala
33d38cf3a4 Changed: #1230 Fix for duplicate ma_cheveux01.(s)item and ma_cheveux02.(s)item 2011-01-11 13:42:15 +01:00
kervala
ce0495b21c Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 20:48:43 +01:00
kervala
4149a0cb0d Changed: Cleanup missing continents in ryzom.world 2011-01-10 14:34:23 +01:00
kervala
faf50ba03b Changed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 14:18:39 +01:00
kervala
ed64aaeb62 Changed: #1231 Remove VC++ projects and solutions which are not needed by Nevrax Linux makefiles 2011-01-10 13:50:07 +01:00
kervala
ede0dcc1ab Fixed: #1230 Missing Sheets for Yubos and NPCs 2011-01-10 11:13:09 +01:00
kervala
462f0fdbbd Added: mp_generator and named_items_2_csv CMake projects 2011-01-09 15:51:12 +01:00
kervala
2c5001ee1b Fixed: Compilation with luabind 0.7 (include luabind/version.hpp only when existing) 2010-12-30 12:20:42 +01:00
sfb
2e5237fbc2 Changed: Corrected typo in file and folder name for an sbrick sheet. 2010-12-21 11:48:09 -06:00
sfb
72d1b7fe02 Changed: Remove "rc2" file from World Editor compilation - not used. 2010-12-21 11:32:56 -06:00
sfb
6e7dbb8604 Changed: Sorted out sbrick files into usable hierarchy. 2010-12-21 11:31:11 -06:00
sfb
61a87f13ce Update: Organized sphrase sheets for easier browsing. 2010-12-21 08:27:55 -06:00
aquiles
f2a709828f Merge 2010-12-19 16:52:13 +01:00
aquiles
3ce6514c26 Changed: #1206 icon location; reinit timer on visible 2010-12-19 16:50:38 +01:00
rti
85872f0da5 Fixed: missing include 2010-12-14 18:12:15 +01:00
aquiles
8907ae1601 Changed: #1206 icon location; reinit timer on visible 2010-12-12 23:28:03 +01:00
rti
5a8f6fa208 Fixed: #1216 plugin and resource paths 2010-12-12 22:12:45 +01:00
rti
15bd88d6cc Added: Georges Editor Qt Logo 2010-12-12 19:18:52 +01:00
rti
8ff3df26b3 Fixed: #1190 Run Georges Editor Qt on Mac OS X 2010-12-12 19:10:58 +01:00
rti
9f0b717db6 merge 2010-12-12 16:02:52 +01:00
rti
e2fd59391b Changed: #1153 app bundle plist references atys.icns 2010-12-12 16:00:51 +01:00
aquiles
1c19d17a29 Changed: #1206 fixed missing stuff 2010-12-12 15:57:34 +01:00
kervala
50926ae62b Fixed: Compilation under Linux 2010-12-12 15:15:10 +01:00
kervala
2763a3ece2 Changed: #878 Fix typos in comments/code 2010-12-12 15:12:49 +01:00
kervala
626f05bcb9 Changed: #878 Fix typos in comments/code 2010-12-08 14:47:17 +01:00
kervala
ce5296a6bc Changed: #1016 entities_game_service segfault in ubuntu 64biten 2010-12-04 15:10:48 +01:00
kervala
dabb47d18a Changed: #1016 entities_game_service segfault in ubuntu 64biten 2010-12-03 15:18:39 +01:00
aquiles
656399e8be Changed: #1150 Switched to 3d view plugin 2010-11-29 15:43:46 +01:00
"Matt Raykowski"
7e56c729b0 Changed: Forgot to make World Editor an MFC-only tool. 2010-11-22 20:31:25 -06:00
aquiles
74d5adb2bb Changed: #1150 reactivated 3d view and improved behaviour 2010-11-22 21:21:07 +01:00
aquiles
6465db378b Fixed: #1163 files for new dialog 2010-11-21 18:59:29 +01:00
aquiles
ad1b7e27e8 Fixed: #1163 icons show up small in table and full size in tooltip over icon cell - dblClk on cell opens filedialog for changing icon 2010-11-21 17:43:38 +01:00
aquiles
2038260b3c Changed: #1150 added progress dialog to show CPath progress and changed config behaviour 2010-11-21 17:40:58 +01:00
kervala
f215136c20 Changed: #825 Remove all warnings when compiling Ryzom 2010-11-21 15:07:59 +01:00
kervala
d9ea939698 Changed: #878 Fix typos in comments/code 2010-11-19 11:20:59 +01:00
kervala
c9c9a24eb7 Changed: #825 Remove all warnings when compiling Ryzom 2010-11-19 11:20:46 +01:00
kervala
2efa82be4e Changed: #841 Change the wrong header in the source code 2010-11-18 21:35:17 +01:00
kervala
56db70265f Changed: #878 Fix typos in comments/code 2010-11-18 21:33:35 +01:00
kervala
b3deb0ffd5 Changed: Fix crashes if interface doesn't have specified controls 2010-11-18 19:41:53 +01:00
kervala
6fe307b61d Changed: #878 Fix typos in comments/code 2010-11-18 19:38:10 +01:00
kervala
719513e31e Changed: Use auto ScreenAspectRatio by default (it works well everytime) 2010-11-18 19:33:34 +01:00
sfb
e663794d09 merge 2010-11-18 09:13:19 -06:00
sfb
78742785a8 Added: Windows shard start/stop script for the CMake build. 2010-11-18 09:09:30 -06:00
sfb
4ee53acaf1 Changed: Fixed paths that reference a moved NLLIGO header. 2010-11-18 09:09:03 -06:00
sfb
b84e13493d Changed: #842 Started adding World Editor to CMake build. 2010-11-18 09:08:24 -06:00
kervala
8e019a7fa4 Fixed: #1198 Window is too large when switching from fullscreen to windowed mode 2010-11-18 15:04:18 +01:00
kervala
09553acc5b Fixed: #1195 EGS crashing on client exit (Windows) 2010-11-18 09:52:38 +01:00
kervala
f437df193e Fixed: #1196 Allow to dump ZBuffer when doing a screenshot 2010-11-17 22:24:04 +01:00
aquiles
35eac29df4 Changed: #1150 fixed some dockwidgets bugs 2010-11-15 00:04:10 +01:00
aquiles
06dc9e622f Changed: #1150 added some source groups to cmake for better file structuring 2010-11-14 22:01:19 +01:00
aquiles
ce85b72410 Fixed: #1168 default & parent box working like a breeze 2010-11-14 21:49:19 +01:00
rti
afe103b4fe merge 2010-11-14 16:02:00 +01:00
rti
4517a1449f Changed: #1190 build app bundle and use QWidget instead of QGLWidget 2010-11-14 15:59:32 +01:00
kervala
54b6685a9e Changed: #878 Fix typos in comments/code 2010-11-13 18:33:01 +01:00
kervala
9550ed9d36 Changed: #878 Fix typos in comments/code 2010-11-12 14:26:38 +01:00
kervala
e1c3041ba6 Fixed: Time difference when threads are on different cores 2010-11-12 13:40:34 +01:00
kervala
4cf6b46cc2 Changed: Save r2_buffer.dat in "save" instead of "data" 2010-11-12 13:37:40 +01:00
kervala
e7d0bb4671 Fixed: Lua bug with wander_destination_reached 2010-11-10 22:13:00 +01:00
vl
5a308b9334 Fixed: screenratio is now ok if we failsafe to window mode 2010-11-09 11:37:19 +01:00
rti
5180dc9afc Changed: #1153 first, check for client_default.cfg in working dir 2010-11-09 02:21:35 +01:00
rti
1ce15d023e Changed: #1153 first, check for client_default.cfg in working dir 2010-11-09 02:16:50 +01:00
kervala
9b1d85e3f8 Changed: Fall back to windowed mode if we can't set a fullscreen mode 2010-11-08 23:42:26 +01:00
kervala
3ad4c4449b Merge 2010-11-08 23:28:09 +01:00
kervala
2196876e71 Changed: #1153 Added <ApplicationDir> as Bundle root folder 2010-11-08 23:23:34 +01:00
rti
b62ae83c3e Changed: #1153 automaticaly update RootConfigFilename in client.cfg 2010-11-08 23:23:03 +01:00
aquiles
676e1b3ccf Changed: #1150 some layout stuff - widgets should behave better now 2010-11-08 14:19:01 +01:00
aquiles
c336c70d64 Fixed: #1173 wrong crafting tool type in basic armor file 2010-11-08 14:15:16 +01:00
aquiles
2e2d0b7d52 Changed: #1168 default checkbox activated, formdelegate adapted to introduced proxymodel 2010-11-08 14:14:28 +01:00
vl
194fdae1bf Added: ignore sigpipe signal generated by libwww 2010-11-08 11:07:38 +01:00
kervala
addb6b4e95 Changed: #1135 Reverted some changes from next Ryzom patch 2010-11-07 18:51:39 +01:00
kervala
c464a2fab9 Changed: #1135 Merge changes from Ryzom patch 1.10 2010-11-05 09:45:24 +01:00
kervala
f9d13d61fc Changed: #878 Fix typos in comments/code 2010-11-04 22:22:29 +01:00
kervala
b443693334 Fixed: #1034 Implement CCustomMouse for Linux 2010-11-04 22:14:47 +01:00
kervala
6f0fef6808 Changed: #1034 Implement CCustomMouse for Linux 2010-11-04 19:35:44 +01:00
kervala
16a086697d Changed: #825 Remove all warning when compiling Ryzom 2010-11-04 19:27:35 +01:00
kervala
470b7e2729 Changed: #825 Remove all warning when compiling Ryzom 2010-11-03 20:47:01 +01:00
rti
ea9a34a6f3 merge 2010-11-03 16:33:11 +01:00
rti
e8cbd26e9f Fixed: #1153 Make ryzom_client run completely in an .app bundle 2010-11-03 16:32:06 +01:00
kervala
ce04f969ef Changed: #825 Remove all warning when compiling Ryzom 2010-11-03 13:45:08 +01:00
kervala
d3a9566b26 Changed: #878 Fix typos in comments/code 2010-11-03 13:44:27 +01:00
rti
fa14447c6c Changed: #1153 Make ryzom_client run completely in an .app bundle 2010-11-03 13:39:35 +01:00
kervala
051ead7e6e Changed: #825 Remove all warning when compiling Ryzom 2010-11-02 21:50:17 +01:00
kervala
a1a6c669f2 Changed: #878 Fix typos in comments/code 2010-11-02 21:49:34 +01:00
kervala
3da284dd30 Changed: #945 Reverted because it brokes mouse under Windows (if we really need to have both motion and click events, we can send them directly from NeL driver) 2010-11-02 21:26:49 +01:00
kervala
1bbb5fa822 Changed: Used write* methods to write variables 2010-11-02 21:21:45 +01:00
kervala
839148e120 Fixed: Georges Editor Qt compilation under Linux 2010-11-02 20:51:39 +01:00
kervala
a4c64bb753 Changed: #1034 Implement CCustomMouse for Linux 2010-11-02 19:45:05 +01:00
aquiles
0f26e09e23 Changed: #1150 Code Cleanup 2010-11-02 15:25:36 +01:00
kervala
d60bcaec05 Changed: #878 Fix typos in comments/code 2010-11-02 14:00:32 +01:00
aquiles
c99202c278 Added: Georges Editor Qt first revision 2010-11-02 13:47:24 +01:00
kervala
12ce931793 Changed: #1034 Implement CCustomMouse for Linux 2010-10-31 14:09:57 +01:00
kervala
28ca970158 Fixed: #1146 Store last login in client.cfg instead of Registry 2010-10-30 17:56:38 +02:00
kervala
39d099f21d Changed: #825 Remove all warning when compiling Ryzom 2010-10-30 14:20:26 +02:00
kervala
952f33039c Fixed: #1135 Merge changes from Ryzom patch 1.10 2010-10-30 13:50:56 +02:00
kervala
44cc617603 Changed: #1135 Merge changes from Ryzom patch 1.10 (fix a crash with FES) 2010-10-28 16:37:59 +02:00
kervala
22c276cf24 Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-26 13:24:22 +02:00
kervala
95e24bab2c Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-25 19:50:22 +02:00
kervala
65fffec520 Changed: #825 Remove all warning when compiling Ryzom 2010-10-24 20:23:15 +02:00
kervala
e498f7e338 Changed: #825 Remove all warning when compiling Ryzom 2010-10-23 19:49:03 +02:00
kervala
21ee456027 Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-23 18:30:59 +02:00
kervala
9c4bf52c7e Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-23 18:16:49 +02:00
kervala
5f92da80b8 Changed: #142 Replace atoi and sscanf by fromString when it's possible 2010-10-23 18:00:04 +02:00
kervala
e4f7ddb305 Changed: #142 Replace atoi and sscanf by fromString when it's possible 2010-10-23 17:39:06 +02:00
kervala
41d2767a33 Changed: #1135 Merge changes from Ryzom patch 1.10 2010-10-23 17:12:00 +02:00
kervala
d68ee5fbe5 Changed: #142 Replace atoi and sscanf by fromString when it's possible 2010-10-23 17:11:21 +02:00