Commit graph

1890 commits

Author SHA1 Message Date
kervala
53d5e56a2a Changed: Don't use NLMISC includes in NLMISC PCH 2013-09-06 14:50:19 +02:00
kervala
12cd9083de Changed: Cleanlooks doesn't exist anymore in Qt 5, so use default style 2013-09-06 14:49:12 +02:00
Thibaut Girka
a45299bfe5 Add support for LibVR 2013-08-28 08:08:22 +02:00
kaetemi
beb66b19b7 Merge with default 2013-09-07 16:25:45 +02:00
kervala
d2a9cb90d0 Changed: Formatting 2013-08-26 12:34:04 +02:00
kervala
dd116afff3 Fixed: Crash when trying to display a missing texture 2013-08-26 12:33:26 +02:00
kervala
a2f91ce484 Changed: Tabulations to spaces 2013-08-05 10:30:40 +02:00
kaetemi
d0a4f5ed75 Fix warning 2013-08-03 21:29:47 +02:00
kaetemi
9dc9acd68f Merge with default 2013-08-01 23:02:49 +02:00
kaetemi
bbe4ea4ba8 Add some basic prediction to CCDBNodeBranch::find 2013-08-01 22:47:46 +02:00
kaetemi
1ed7e4fcff Force link 2013-08-01 10:11:11 +02:00
Quitta
63db620ca6 Merge with default 2013-07-31 16:26:22 +02:00
Quitta
e3625bc4e4 Merge with default 2013-07-31 16:17:29 +02:00
Quitta
0bf8c4d526 fix for getting client working + possibly auto login for ingame part 2013-07-30 01:46:56 +02:00
kaetemi
7bbf40ea19 Improve performance of UsedTexture debugging info in OpenGL driver 2013-07-29 03:41:10 +02:00
kaetemi
7046b6f364 NLGUI files dbgroup_combo_box.cpp and dbgroup_select_number.cpp were not linked 2013-07-28 21:39:54 +02:00
kaetemi
b09e28e9e0 Avoid having to use 'set' action handler, which parses the value expression on every use, in interface links by implementing use of cdb nodes as targets 2013-07-28 05:10:07 +02:00
kaetemi
70f83e1fb9 Parse action handler condition for interface link in advance 2013-07-28 03:02:07 +02:00
kaetemi
36c969252b Avoid redundant per-frame calls to getDbProp in NLGUI::CWidgetManager 2013-07-28 00:48:34 +02:00
kaetemi
a519de3e5d Build ligo outside the database 2013-07-27 04:03:05 +02:00
kaetemi
bcba46f950 Merge with default 2013-07-25 21:18:52 +02:00
kaetemi
9587ccc6ba Silently sneaking in a nicer splash image for ovqt 2013-07-25 02:39:07 +02:00
kaetemi
fd285cc703 Merge with default 2013-07-25 00:37:00 +02:00
kaetemi
f83fdf5a2f Fix bug #45 crash in zone lighter with large number of CPU cores 2013-07-24 20:51:43 +02:00
kaetemi
da53f11c73 Use tags for pacs prim export 2013-07-24 20:51:38 +02:00
kervala
dfbf2998b0 Fixed: lua_open() doesn't exist with Lua 5.2 2013-07-24 18:47:50 +02:00
kervala
bd8a606341 Fixed: Compilation in 64 bits with Windows SDK 8.0 (patch provided by StudioEtrange) 2013-07-24 18:47:04 +02:00
kaetemi
b1f953c2a1 Merge with default 2013-07-19 15:38:49 +02:00
kaetemi
b6c869f072 Fix a divide-by-zero crash in the 3ds Max plugins on really fast PCs 2013-07-19 15:37:25 +02:00
kaetemi
4a593aa273 Merge with default 2013-07-19 14:10:07 +02:00
kaetemi
62f0c1e20c Merge with default 2013-07-18 23:05:25 +02:00
kaetemi
e822c2be0d Fix an error in 3ds Max with the material script 2013-07-18 18:15:53 +02:00
Michael Witrant
59dc1a6c16 Fixed definition tests for optional LibOVR 2013-07-06 20:40:42 +02:00
Michael Witrant
69c194f57f LibOVR is optional, and is disabled by default 2013-07-06 20:05:19 +02:00
Michael Witrant
67ebf920ec Added LibOVR finder and Linux support, ref #43 2013-07-06 19:33:07 +02:00
kaetemi
cb9e5762db Don't render to texture when in wireframe mode, re #43 2013-07-05 03:42:38 +02:00
kaetemi
c3f6f5b8ff Put stereo render loop inside ryzom client main loop, see #43 2013-07-05 02:38:56 +02:00
kaetemi
541f75920b Init/release VR interfaces in ryzom client, ref #43 2013-07-05 02:04:34 +02:00
kaetemi
6113b07673 Distort 2D gui as well, ref #43 2013-07-04 21:12:11 +02:00
kaetemi
4b2ea661cc Fix particles being animated twice in stereo render, see #43 2013-07-04 00:42:06 +02:00
kaetemi
fd1d606154 Add stereo debugger for visually comparing rendered frames, ref #43 2013-07-04 00:09:10 +02:00
kaetemi
d57b7b39fe Use width instead of height of screen for hmd fov, re #43 2013-07-03 06:04:37 +02:00
kaetemi
a531535dfa Add minimal head model and world scale, ref #43 2013-07-03 05:21:32 +02:00
kaetemi
299b3ec401 Make bloom work together with render target used for the rift shader, ref #43 2013-07-03 03:53:32 +02:00
kaetemi
9516851bee Remove unnecessary user render target code from bloom, see #43 2013-07-03 03:21:57 +02:00
kaetemi
e3784571cd Add arbfp1 and fp40 barrel fragment programs, see #43 2013-07-02 19:39:05 +02:00
kaetemi
118340d821 Test arbfp1, see #43 2013-07-02 18:48:29 +02:00
kaetemi
2315ae9c5a Prefer NPOT texture over RECT texture 2013-07-02 18:43:15 +02:00
kaetemi
a924479a5c Render left and right deformed view, re #43 2013-07-02 03:34:49 +02:00
kaetemi
6b8d43181d Test the barrel shader, see #43 2013-07-02 02:40:27 +02:00
kaetemi
3a12aa5894 Render the scene to a target texture for the stereo rendering filter, ref #43 2013-07-02 00:55:13 +02:00
kaetemi
3b630492aa Fix a render target issue, see #43 2013-07-02 00:53:45 +02:00
kaetemi
ffc91631e7 Create stereo render target, see #43 2013-07-01 23:23:54 +02:00
kaetemi
f25a9da718 Add interface for stereo display render targets, ref #43 2013-07-01 21:23:47 +02:00
kaetemi
9960b9dfdb Cleanup 2013-07-01 20:15:55 +02:00
kaetemi
b04d278a27 Create interface classes for stereo displays and head mounted displays, see #43 2013-06-28 23:19:32 +02:00
kaetemi
d404c1228c Create a clipping frustum, ref #43 2013-06-26 21:35:36 +02:00
kaetemi
2f4867ab78 Allow multiple user cameras to be calculated separately, useful for sky etc, re #43 2013-06-26 20:57:37 +02:00
kaetemi
4a579d0af2 Fix warning 2013-06-26 20:10:30 +02:00
kaetemi
eb196fd99a Adjust 2D interface shift, re #43 2013-06-26 19:58:27 +02:00
kaetemi
8230238b5f Add eye distance in 2D interface shift, re #43 2013-06-26 17:24:23 +02:00
kaetemi
1b8ddaa87b Add 2D interface shifting calculations, see #43 2013-06-26 16:59:08 +02:00
kaetemi
78ae99731d Correctly adjust text to viewport, re #43 2013-06-26 16:08:48 +02:00
kaetemi
cbd72f73ff Add some comments, see #43 2013-06-26 15:55:39 +02:00
kaetemi
7672ab2812 Cleanup and make bloom work with stereo rendering, re #43 2013-06-26 15:49:31 +02:00
kaetemi
e51d9e15d9 Render from multiple cameras, see #43 2013-06-26 08:00:19 +02:00
kaetemi
a7cf55c58e Read sensor data and set camera in snowballs, ref #43 2013-06-26 04:57:58 +02:00
kaetemi
dc813a060e Add library name to device name, re #43 2013-06-26 02:55:15 +02:00
kaetemi
b45bdb88e6 List stereo devices, see #43 2013-06-26 02:45:49 +02:00
kaetemi
982bf804de Added some notes 2013-06-20 00:25:52 +02:00
kaetemi
1f68025931 Rename some functions to follow the same naming convention of others 2013-06-19 23:49:39 +02:00
kaetemi
1ed0d46026 Cleanup 2013-06-19 23:34:40 +02:00
kaetemi
aa3462b7bc Add support for fp40 with opengl 2013-06-19 22:41:03 +02:00
kaetemi
0d1e405d3e Activate textures for postprocessing material under direct3d 2013-06-19 21:16:13 +02:00
kaetemi
cfb9827b2c Test texture with postprocessing material, seems to work with opengl 2013-06-19 20:47:23 +02:00
kaetemi
4cc4a84578 Fix linux compile 2013-06-19 16:18:09 +02:00
kaetemi
3865e6e56f Add function to check which pixel program profiles are available on a driver 2013-06-19 05:03:47 +02:00
kaetemi
9c5fabf615 Add test for ps.1.1 pixel program in snowballs (it works too now) 2013-06-19 04:03:32 +02:00
kaetemi
0c1bfe0f63 Cleanup more unneeded code 2013-06-19 02:36:57 +02:00
kaetemi
72035e936a Removed unneeded parser related code from the opengl pixel program implementation 2013-06-19 02:33:19 +02:00
kaetemi
7dcc86c717 Add direct3d diff for old nevrax pixel program code, marked a todo in the comments 2013-06-19 02:10:38 +02:00
kaetemi
acf8ec653c Added diff to opengl driver for old nevrax pixel program code, marked todos in comments 2013-06-19 02:01:12 +02:00
kaetemi
cb966505cc Add rest of the diff from the old nevrax code for pixel programs to NL3D 2013-06-19 01:38:23 +02:00
kaetemi
7da48d8866 Removed some CEffect related bit that slipped in 2013-06-19 01:22:26 +02:00
kaetemi
9f6b60a920 Add diff from old nevrax pixel program code to IDriver, CEffect related code not included 2013-06-19 01:20:51 +02:00
kaetemi
b5dfdbdd55 Simplify CPixelProgram 2013-06-19 01:19:45 +02:00
kaetemi
fd42d61af9 Add some files from old nevrax shader code for exposing pixel programs in the drivers 2013-06-19 01:14:30 +02:00
kaetemi
ad6cc747b9 Backed out changeset ea4b76b7213a, bad approach 2013-06-19 01:03:20 +02:00
kaetemi
23e3393d2e Allow rendering with bloom to a user provided render target (untested) (#43) 2013-06-17 00:45:17 +02:00
kaetemi
09df2d8bef Remove silly heap allocation of a null pointer 2013-06-16 23:49:45 +02:00
kaetemi
abdeee4b81 Add info structure for multipass camera rendering effects #43 2013-06-16 20:48:17 +02:00
kaetemi
5fa4beab46 Fixes to compile Ryzom Client with lua 5.2 2013-06-16 03:43:45 +02:00
kaetemi
7bb6775261 Compile NLGUI with lua 5.2 2013-06-16 02:33:04 +02:00
kervala
f8083efd87 Added: CMake project for shape2obj 2013-06-10 15:48:10 +02:00
liria
053abe4b07 kervala's enhancements and fixes for the Windows compilation. 2013-06-09 15:55:59 +02:00
liria
c5f77a12df FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows. 2013-06-08 16:15:41 +02:00
liria
78f9800b17 FIXE: Linux/Windows compilation : revert the code of the 'void dir(...)' function for windows with using conditional compilation. 2013-06-08 15:38:04 +02:00
liria
4caa7fba89 FIXE: replace the WIN32 API for directories manipulation by the the POSIX API to compile with linux. 2013-06-08 14:39:30 +02:00
dfighter1985
a88a4ad992 FIXED: GUI not showing up because of the interface user functions not getting registered, because of a file linking issue. 2013-06-05 03:29:34 +02:00
Dzmitry Kamiahin
7ddd062666 Fixed self-comparsion in ps. 2013-05-04 01:57:53 +03:00
sfb
ff3cc0a05e merge 2013-05-02 14:38:49 -05:00
kaetemi
a50ffb5de5 This should fix #41. It was creating the unknown for the new type and then returning a new sheet for the requested unknown 2013-05-02 21:37:15 +02:00
sfb
70397fe3bd merge 2013-05-02 14:34:40 -05:00
sfb
76dea51b8f fixed #40 with an explicit static_cast. 2013-05-02 14:31:10 -05:00
dfighter1985
8dd4c1abfe Don't build GUI Editor when not building the GUI library. 2013-05-02 20:19:35 +02:00
kervala
8a68c5e54f Changed: Moved Ryzom detailed version in client 2013-04-29 14:46:53 +02:00
kervala
79cd42d7c6 Changed: Added a new event EventCloseWindowId when system reports window should be closed 2013-04-29 11:15:14 +02:00
kervala
36f996a20b Fixed: Virtual destructor warning 2013-04-29 10:41:34 +02:00
kervala
31335cc491 Fixed: PCH compilation 2013-03-31 23:36:56 +02:00
kervala
02d6565234 fixes #32 build failure/error using clang 2013-03-26 13:56:16 +01:00
kervala
c8334e7131 fixes a warning 2013-03-24 20:16:53 +01:00
kervala
7de717f9e2 fixes #31 Luabind can't be found
Added PCH support to NeL GUI
2013-03-24 20:16:23 +01:00
dfighter1985
045502d5a3 MODIFIED: no more action handler spam. 2013-03-12 07:16:16 +01:00
dfighter1985
f55ab4e21e GUI Editor no longer depends on RTTI typename, instead it uses GetClassName() string provided by DECLARE_UI_CLASS(). 2013-02-20 22:05:09 +01:00
dfighter1985
668e34f996 MODIFIED: #20 Resolved build errors with stlport. 2013-02-19 19:29:48 +01:00
dfighter1985
6d43dd5a09 Merged in dfighter1985/ryzomcore (pull request #3)
GCC build error fixes for #20
2013-02-19 17:19:51 +01:00
dfighter1985
8a486224d7 MODIFIED: #20 Resolved some GCC build in the GUI Editor. 2013-02-19 17:16:58 +01:00
mattraykowski
9048c3bb21 changed #20 - moved the libwww package discovery and fixed include paths in library project. 2013-02-19 10:04:40 -06:00
dfighter1985
b25d4b628f MODIFIED: Resolved some GCC build errors. 2013-02-17 14:30:05 +01:00
mattraykowski
aa261f28a4 merging gui editor repo. 2013-02-14 09:53:06 -06:00
dfighter1985
33d84c99d7 CHANGED: Somehow lost this code part during development. 2013-02-14 12:13:32 +01:00
dfighter1985
543488b490 Merged mainline default branch changes. 2013-02-14 10:47:10 +01:00
kervala
4f6cb3e329 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:35:51 +01:00
kervala
b368cae7a5 Changed: Typo fixes (Thanks to DuDraig!) 2013-02-12 17:07:38 +01:00
kervala
1bf4109e5b Changed: Typo fixes (Thanks to DuDraig!) 2013-02-11 22:34:24 +01:00
kervala
5794497a79 Changed: French comments translated to English 2013-02-11 22:24:48 +01:00
kervala
8409d5a371 Changed: Typo fixes (thanks to Vagrant!) 2013-02-09 10:05:32 +01:00
kervala
2b9dc61e3e Changed: Warnings with clang 2013-02-08 18:17:42 +01:00
kervala
dc28573170 Changed: Preliminary memory leaks detection under Windows 2013-02-08 13:29:17 +01:00
kervala
39668984c1 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:26:07 +01:00
kervala
98606fb5b5 Changed: Typo fixes (thanks to Vagrant!) 2013-02-08 13:17:44 +01:00
mattraykowski
75f40c9e79 merge, fixed inconsistent newlines 2013-01-30 09:57:53 -06:00
kervala
0a2429c05e Changed: OpenGL headers not being found by PCH 2013-01-09 09:29:15 +01:00
dnk-88
da8e532e8e Change: Optimized placement source files in object viewer qt 2013-01-06 16:25:28 +03:00
dnk-88
697a92b1d6 Change: Fixed incorrect behavior scroll of 2d view in landscape editor qt 2012-12-15 00:41:29 +03:00
kervala
2b4119c428 Fixed: Compilation with VC++ 2010 and 2012 2012-12-11 12:22:41 +01:00
kervala
2cd7419f42 Changed: PCH optimizations 2012-12-11 11:59:54 +01:00
kaetemi
75dd245195 Changed: Better log text 2012-12-10 13:32:17 +01:00
kaetemi
7707463fe2 Fixed: typo 2012-12-10 13:30:14 +01:00
kaetemi
971ffdb8e3 Changed: Alternative code for play function for streaming source 2012-12-10 13:28:39 +01:00
kaetemi
e32d4cbf1d Changed: Additional checks for streaming buffers in OpenAL 2012-12-10 13:09:41 +01:00
kervala
b0af47cd3a Fixed: Include libxml2 header 2012-12-08 13:13:00 +01:00
kervala
cbb8631789 Fixed: PCH for Object Viewer plugin 2012-12-08 13:11:17 +01:00
kervala
230a8138d9 Changed: Minor typos 2012-12-08 12:07:23 +01:00
kervala
88f50cb6a0 Changed: Preliminary memory leaks detection under Windows 2012-12-08 11:40:34 +01:00
kervala
cc4480844e Changed: Compilation with PCH optimizations 2012-12-08 11:32:31 +01:00
kervala
13eed944d6 Changed: Compilation with VC++ 2012 2012-12-08 11:28:46 +01:00
kervala
f6e1bc3f3a Changed: Methods constification 2012-12-08 11:27:18 +01:00
kervala
275d7cf181 Changed: Add Qt headers in PCH for speed improvement 2012-12-08 11:25:21 +01:00
kervala
4d6ab65a36 Changed: Code simplification 2012-12-08 11:24:43 +01:00
kervala
cb6aefd69d Added: PCH for Georges Editor Plugin 2012-12-08 11:22:05 +01:00
kervala
91b63a4f3b Changed: Compilation with GCC 2012-12-08 11:18:26 +01:00
kervala
ccc51e18b8 Changed: Simplification of OpenGL ES driver 2012-12-06 10:48:46 +01:00
kervala
a1942b9dd4 Changed: Updated OpenGL registries 2012-12-06 09:39:53 +01:00
kervala
c0383774c6 Changed: Preliminary memory leaks detection under Windows 2012-12-05 10:26:01 +01:00
kervala
76b6d1de72 Changed: Display HRESULT when D3DXCreateEffect fails 2012-12-03 09:37:21 +01:00
kervala
930b80c749 Changed: Replaced size() by !empty() 2012-12-03 09:36:45 +01:00
kervala
8f19d1d643 Changed: Minor typos 2012-12-03 09:09:31 +01:00
dfighter1985
5f0e715df4 MODIFIED: #1471 Forgot to remove parents' properties before saving the node properties. 2012-12-02 19:47:12 +01:00
dfighter1985
713c256c2a MODIFIED: #1471 We should be able to close the application even when there's no loaded project. 2012-12-02 18:17:39 +01:00
kervala
e344fe26cb Changed: Applied Kaetemi patch to disable old S3TC library mistakes 2012-12-02 10:20:19 +01:00
kervala
6ab274422a Changed: Disabled some useless temporary files 2012-12-01 12:43:35 +01:00
dfighter1985
421582d386 MODIFIED: #1471 Merged mainline default to this branch. 2012-11-25 05:22:40 +01:00
kervala
003ec79559 Changed: VC++ 2012 partial support 2012-11-24 20:26:55 +01:00
kervala
e986569ef9 Fixed: Wrong EOL 2012-11-24 18:38:56 +01:00
dfighter1985
295ab058a5 MODIFIED: #1471 Incompatible / unincrementable iterators assert will no longer be hit in debug mode with M$ STL when updating the interface anims. 2012-11-22 22:57:37 +01:00
dfighter1985
bbaefe88d5 MODIFIED: #1471 Exiting OVQT will now work again properly. 2012-11-22 21:22:28 +01:00
dfighter1985
0ce956b71a MODIFIED: #1471 There shouldn't be an error message when clicking cancel in the open file dialog. 2012-11-21 23:36:07 +01:00
dfighter1985
1667365842 MODIFIED: #1471 Widget template changes can now be saved. 2012-11-21 21:33:08 +01:00
dfighter1985
6343ce5750 MODIFIED: #1471 Oups, forgot these warning messages... 2012-11-20 04:54:09 +01:00
dfighter1985
e8d3255990 MODIFIED: #1471 Adding new widget now works in the widget property dialog. 2012-11-20 04:50:51 +01:00
dfighter1985
2f18aec5d4 MODIFIED: #1471 Adding new property now works. 2012-11-19 21:06:26 +01:00
dfighter1985
c7131429c9 CHANGED: #1471 Removing widget properties from the widget properties dialog will now work. 2012-11-18 02:20:52 +01:00
dfighter1985
b223bb43ad CHANGED: #1471 Removing widgets from the widget properties dialog will now work. 2012-11-17 20:13:29 +01:00
dfighter1985
d47c317728 CHANGED: #1471 Widget property templates are now stored in a tree. Also added some new controls to the widget property dialog. 2012-11-17 04:55:12 +01:00
dnk-88
199ee931d9 Changed: Fixed crash land editor qt 2012-11-11 13:33:43 +03:00
kervala
05ae6371c1 Changed: Minor changes 2012-10-28 13:47:09 +01:00
kervala
89e78b8ad2 Fixed: MFC tools compilation with STLport 2012-10-28 13:41:50 +01:00
kervala
c4706adc76 fixes #3 allow Qt without STLport to link to NeL with STLport 2012-10-28 13:34:58 +01:00
kervala
8e110a8bb8 Fixed: Compilation with 64 bits MFC 2012-10-28 12:22:30 +01:00
kervala
b9fd49ebc3 Move all PACS headers in nel/include/pacs directory (fixes #2) 2012-10-28 11:55:21 +01:00
kervala
d68e03b816 Changed: NPOT textures finally don't need that in D3D 2012-10-27 18:44:38 +02:00
kervala
40227ccec5 Fixed #1: Implement anisotropic filtering for textures 2012-10-27 17:46:13 +02:00
kervala
100923cb6c Changed: Minor changes 2012-10-27 16:39:06 +02:00
kervala
0dd9100e85 Changed: Simplify OpenGL ES driver by using some aliases 2012-10-27 16:27:13 +02:00
dfighter1985
0d27998506 CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010. 2012-10-24 18:16:01 +02:00
kervala
ddfc526d0c Changed: #573 Add anti-aliasing to the OpenGL Driver 2012-10-17 11:05:51 +02:00
kervala
0698f1abc2 Changed: Replaced string empty comparisons with empty() 2012-10-06 18:17:57 +02:00
kervala
2b86a180e6 Changed: Replaced string empty comparisons with empty() 2012-10-06 17:17:26 +02:00
kervala
eb3eccc7b0 Changed: Updated description for CBitmap::load and CBitmap::loadSize 2012-10-06 15:49:27 +02:00
kervala
6085e9bba4 Fixed: Compilation under Mac OS X 2012-10-05 20:36:10 +02:00
kervala
cdf8fd5c6e Fixed: #1496 Fall back to OpenAL default device (patch provided by simco, thanks!) 2012-09-29 12:51:15 +02:00
kervala
95d4d5972e Changed: #825 Remove all warnings when compiling Ryzom 2012-09-27 22:25:00 +02:00
kervala
2d5142844a Changed: Use *_PREFIX instead of fixed values with INSTALL 2012-09-27 22:11:26 +02:00
kervala
ae1118744c Changed: Use RYZOM_SHARE_PREFIX as prefix to look for leveldesign data 2012-09-26 12:53:03 +02:00
kervala
74e69d4bc2 Changed: Added zbuffer formats (commented) 2012-09-26 12:47:13 +02:00
kervala
c4f90a40d2 Changed: Drivers runtimes should go in NL_DRIVER_PREFIX 2012-09-26 12:46:43 +02:00
kervala
4dfb33fb22 Changed: Added a warning when a texture can't be created in D3D driver 2012-09-26 00:02:27 +02:00
kervala
bc477d7d8a Changed: #1254 Error while compiling with current stable squish 2012-09-25 13:20:37 +02:00
kervala
182a79f2cb Changed: #825 Remove all warnings when compiling Ryzom 2012-09-25 13:20:25 +02:00