Commit Graph

230 Commits

Author SHA1 Message Date
ulteq
f9d729c874 Scopes - Fix 'boreHeight' and 'baseAngle' MP synchronization (#5917)
* Scopes - Unify 'getBaseAngle' & 'getBoreHeight' API

* Scopes - Fix boreHeight and baseAngle MP synchronization
* TODO: Cache the calculation or use publicVariables instead

* Cleanup unused GVARs

* Scopes - Cache getBaseAngle and getBoreHeight results

* Sync baseAngle/boreHeight

* Remove boreHeight/Angle caching

* Cleanup inv check
2017-12-15 10:22:31 -06:00
PabstMirror
a97dea896f scopes - Fix base angle (#5916) 2017-12-15 10:25:00 +01:00
Andrea Verano
2ecc835438 Italian Translation Update (#5914)
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes

Fixed some strings in:
-Medical
-Scopes
2017-12-14 23:32:51 -06:00
ulteq
b77c4d4667 Rangecard - Fixes broken bore height display (#5907)
* Reverts the getBoreHeight API change from:91425f8576
2017-12-14 13:43:32 +01:00
ulteq
24b58fbb21
Scopes - Allow 0.05 mrad increments (#5840)
* Scopes - Allow 0.05 mrad increments
2017-12-02 16:23:41 +01:00
classic
504d54461e Update Japanese translations (#5831)
* Update Japanese translation for captives

* Update Jpn translation for common

* Update Jpn translation for cookoff

* Update Jpn translation for finger

* Update Jpn translation for googles

* Update Jpn translation for hitreactions

* Update Jpn translation for interaction

* Update Jpn translation for magazinerepack

* Update Jpn translation for mk6mortar

* Update Jpn translation for noradio

* Update Jpn translation for overheating

* Update Jpn translation for pylons

* Update Jpn translation for rearm

* Update Jpn translation for respawn

* Update Jpn translation for scopes

* Update Jpn translation for spectator

* Update Jpn translation for switchunits

* Update Jpn translation for vehiclelock

* Update Jpn translation for weaponselect

* Update Jpn translation for weather

* Update Jpn translation for zeus

* Update Jpn translation for reloadlaunchers

* fix the tag
2017-11-30 16:52:27 -06:00
ulteq
09c3187c21
Scopes - Adds simplified zeroing subsystem (#5787)
* Client side setting to choose the preferred zeroing method
* Replicates the behaviour of the vanilla zeroing system
2017-11-29 11:38:19 +01:00
ulteq
af1f36c14a Advanced Ballistics - Muzzle velocity variation
* Simulates slight variations in muzzle velocity between each shot
2017-11-23 14:36:36 +01:00
ulteq
b99a10ad63
Merge pull request #5804 from acemod/scopes-iron-sight-fix
Scopes - Fixed iron sight zeroing
2017-11-22 11:28:28 +01:00
ulteq
c3e1fe31f8
Scopes - Fixed major typo affecting trajectory synchronization (#5805) 2017-11-22 09:59:01 +01:00
ulteq
ce825ce8d3 Scopes - Add 'DISABLE_DISPERSION' helper flag
* Allows you to disable vanilla dispersion for testing purposes by defining 'DISABLE_DISPERSION'
2017-11-21 23:57:12 +01:00
ulteq
91425f8576 Scopes - Added new config entry to fix the iron sight zeroing 2017-11-21 23:57:07 +01:00
ulteq
9cad5873d0
Scopes - Adds 'Reset zero' interaction (advanced ballistics only) (#5789)
* Allows you to reset any zero adjustment on your current scope
2017-11-18 13:59:42 +01:00
ulteq
aab09584b7
Scopes - Persistent zero adjustments (#5753)
* Makes manual zero adjustments (advanced ballistics only) for each weapon & scope combination persistent across game restarts / mission restarts / weapon or scope changes.
2017-11-17 19:08:03 +01:00
God of Monkeys
257bde4eef Update Chinese stringtable (#5786) 2017-11-17 10:18:54 -06:00
Andrea Verano
4d24840181 Italian Translation Update (#5779)
Added new strings in:
-captives
-common
-cookoff
-finger
-goggles
-hitreactions
-interaction
-magazinerepack
-mk6mortar
-noradio
-overheating
-rearm
-respawn
-scopes
-spectator
-switchunits
-vehiclelock
-weather
-zeus

Fixed some strings in:
-goggles
-magazinerepack
-nightvision
-sandbag
-switchunits
-trenches
-vehiclelock
-weather
2017-11-16 23:35:49 -06:00
ulteq
3729f377ad
Sort more settings into categories (#5760) 2017-11-13 18:50:24 +01:00
ulteq
39c56447d9
Scopes - Hide 'up' direction lettering (#5751)
* Improves readability
2017-11-13 00:37:03 +01:00
ulteq
fbaa071a4e
Merge pull request #5747 from acemod/scopes-zeroing-fix
Scopes - Improved zero angle calculation
2017-11-12 14:16:34 +01:00
ulteq
224e2cb777 Scopes - Take rail base angle into account
* Removes fixed angular offsets from the zero angle calculation
2017-11-12 12:21:06 +01:00
ulteq
6b68ff426f Scopes - Fixed zero angle prediction
* Corrects the prediction of the (hair-raising!) zero angle calculation in the vanilla-game
2017-11-12 12:21:03 +01:00
ulteq
afbc8bfb82 Revert "Scopes - Fixes zero on three vanilla weapons (#5696)"
This reverts commit 4c2348cff5.
2017-11-12 11:45:38 +01:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
ulteq
9ea1f6839f
Scopes - Fixed bugs in the zero angle calculation (#5742)
* Fixed typo in the module setting parsing (reference temperature was way off)
* Fixed bug in the zero angle calculator (muzzle velocity was off in most cases)
2017-11-11 14:15:59 +01:00
ulteq
28706c4dab
Scopes - UI improvement (#5702)
* Displays U, D, L, R behind the MIL turret adjustment number
* Allows clients to select their preferred UI type
* Improves the text alignment
2017-11-08 14:04:09 +01:00
ulteq
e1213483e6 Remove duplicate macro definitions 2017-11-06 18:33:08 +01:00
ulteq
008602590c Fixes bugs in newly added macro based MRAD/MOA conversion
* Fixes: 5729
2017-11-06 17:24:21 +01:00
ulteq
4c2348cff5
Scopes - Fixes zero on three vanilla weapons (#5696)
* Manually fix rail heights where the automated gathering failed
* Affects: Noreen "Bad News" ULR, Vector SMG and ASP-1 Kir
2017-10-27 22:53:15 +02:00
ulteq
3484942680 Scopes - Fixed MRAD conversion (#5651)
* Same issue as https://github.com/acemod/ACE3/pull/5640
2017-10-22 10:44:00 +02:00
ulteq
0aca46d7aa Scopes - BoreHeight config revamp (#5648)
* Scopes - Added rail heights for all vanilla guns
* Scopes - Improved default rail height
* Scopes - Updated all scope heights
* ATragMX - New default bore heights
* ATragMX - Updated scope base angles
2017-10-22 10:28:20 +02:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
shukari
22c8ef1e8a German stringtable updates (#5539)
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
2017-10-07 13:37:59 +02:00
ulteq
be482ea097 Advanced Ballistics - Drag model revamp & Spin drift correction (#5566)
* Advanced Ballistics - Drag model revamp
- Moved away from using the drag tables from the GNU exterior ballistics library
- The drag functions are now based off this data from JBM Ballistics: http://www.jbmballistics.com/ballistics/downloads/text/
- The differences are minor, but some players might still appreciate the additional authenticity

* The Mach number is now calculated in relation to the air temperature.

* Improved speed of sound calculation accuracy.

* Advanced Ballistics - DLL update

* Advanced Ballistics - Added drag function reference (JBM Ballistics)

* Advanced Ballistics - Fixed calculation error in the spin drift simulation
- The error was introduced with this PR (https://github.com/acemod/ACE3/pull/4708)

* More descriptive variable names

* Minor performance optimizations

* Fixed some minor issues

* DLL rebuild

* Utilize new 'toFixed' script command
- Small performance improvement

* Fixed a typo

* Use correct reference speed for the drag compensation

* Updated all 'airFriction' values to match the new drag model

* 'Default' atmosphere now equals the ICAO standard atmosphere

* Update reference humidity to meet the ICAO standard
2017-10-06 13:05:20 -05:00
jonpas
e11e102a76 Underwater actions support (#4984)
* Enable majority of actions underwater

* Remove log

* Add logistics_wirecutter support (don't play kneel animations underwater - looks silly)

* Don't perform kneel animations when repairing or medicaling underwater

* Fix interaction menu rendering underwater (was moving based on player eye level due to height max used for large vehicles)

* Fix attach underwater (LIW does not work underwater, LIS does), Add attach scan drawing define

* Remove left-over systemChat

* Remove vehiclelock from Plane, Disallow linking belt underwater, Allow checking ammo when sitting via action (was already possible via keybind), Use param for LIS
2017-08-22 13:30:56 -05:00
Dissyu
a7954368f4 Fix Chinese content & missing string (#5375)
* Fix missing string with stringtable

Fix Advanced Fatigue & QuickMount

* Fix Chinese content & missing string

* Fix Gestures & DAGR missing string

* Fix quickmount string with vanilla string

* Remove adr97 unnecessary string
2017-07-19 20:57:20 +02:00
jonpas
5cf7569711 Correct new Chinese stringtable identifiers (#5334) 2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589 Add Chinese Traditional & Simplified Localization (#5295)
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
Phyma
ffaa195fe5 Conform function headers to coding guidelines (#5255)
* Fixed headers to work with silentspike python script

* Fixed rest of the files

* Fixed ace-team
2017-06-08 15:31:51 +02:00
Andrea Verano
e3fd1612e2 Italian translation (Add & Fix) (#5193)
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...

Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05:00
11RDP-LoupVert
bcd73edaba French localization complete (#5079)
* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.
2017-04-12 10:39:41 +02:00
PabstMirror
110bce763f Fix intergrated scopes (#4945) 2017-03-08 19:31:26 +01:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821)
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
2017-01-17 15:33:22 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794)
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
2017-01-02 17:52:01 -06:00
markooff
0c069a6bd2 polish translations (#4734)
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
2017-01-02 13:21:47 +01:00
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
classic
05ddca5b90 Jpn translation v382 (#4710)
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
2016-11-25 18:50:07 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
ulteq
dbb59c8fd1 New 'overwriteZeroRange' setting 2016-11-20 09:05:42 +01:00
ulteq
bb71885b42 Added config settings to optic_Nightstalker, optic_NVS and optic_TWS 2016-11-20 09:05:42 +01:00
ulteq
273e603cad Fix 'ACE_ScopeZeroRange' setting being ignored when placed in weapon classes
* Only relevant for weapons with integrated scopes
2016-11-20 09:05:42 +01:00
ulteq
1f364da0df Fix 'forceUseOfAdjustmentTurrets` affecting all scopes including iron sights 2016-11-20 09:05:42 +01:00
ulteq
79d087e784 Reset scope adjustments when either the weapon or the scope change. 2016-11-15 23:11:22 +01:00
ulteq
8c49433b49 Added new ace_scopes module setting 'correctZeroing' (default on) 2016-11-15 23:11:22 +01:00
ulteq
2f23f1ca6c Bugfix - Fixes ace_scopes affecting under-barrel grenade launchers 2016-11-15 23:11:22 +01:00
ulteq
7fa73744e9 Cleanup - partly merged #4658
* Removed getVariable QGVAR(Adjustment) boilerplate
* Less calls to setVariablePublic
* Removed vanilla zeroing element hiding (fixes warning in log file)
* Moved settings evaluation into ace_settingsInitialized event handler
2016-11-15 23:11:22 +01:00
ulteq
10cc0ba951 Moved all zero angle calculations into the advanced_ballistics.dll
* Speeds up ATragMX
* Speeds up RangeCards
* Speeds up Scopes
2016-11-15 23:11:22 +01:00
ulteq
789a169b0e Allow using adjustment turrets on weapons with integrated scopes 2016-11-15 23:11:22 +01:00
ulteq
429bffd039 Moves the bore height calculation into FUNC(inventoryCheck) 2016-11-15 23:11:22 +01:00
ulteq
a687c49d2a Adds settings module for ace_scopes
* Interconnects the rangecard and scopes modules
* Hides the zeroing text when the vanilla zeroing is overwritten
* Makes the scopes module fully compatible with any 3rd party weapon pack without the need for addition compat pbos (though their use is still recommended)
2016-11-15 23:11:22 +01:00
ulteq
36c14c5dc4 Feature - Vanilla zeroing fix 2016-11-15 23:11:22 +01:00
commy2
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
classicarma
686b534701 translate scopes 2016-09-28 01:22:56 +09:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
PabstMirror
455f65947a Minor cleanup of fired EH listeners 2016-07-23 23:08:40 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
J3aLeiNe
fd8167b7e7 AB - correct mildot reticle LRPS/AMS/KHS (#3664)
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications
2016-05-07 22:20:50 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
e1db193099 remove unused config and remove some wrong base classes 2016-02-21 22:50:15 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
commy2
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
PabstMirror
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00