Commit graph

422 commits

Author SHA1 Message Date
aap
68d3ea9c42 getting the vice city map to work 2020-05-05 23:27:43 +02:00
aap
e81652c2fc cleaned up MIAMI ifdefs 2020-05-05 18:06:38 +02:00
Sergeanur
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL 2020-05-05 18:32:46 +03:00
Sergeanur
c2b9ddc5b8 Revert "Remove Miami stuff"
This reverts commit 9960c41193.
2020-05-05 18:04:43 +03:00
Sergeanur
9960c41193 Remove Miami stuff 2020-05-05 18:04:18 +03:00
aap
b3b9be5e8c merged master 2020-05-05 14:21:13 +02:00
Sergeanur
4cc1bb92e7 Make CBaseModelInfo fields protected 2020-05-05 15:06:55 +03:00
Sergeanur
e9b334d7bf More use of GetModelIndex 2020-05-05 14:48:35 +03:00
aap
b44df26d3e implemented most of streamed collisions and big buildings 2020-05-05 13:02:42 +02:00
Sergeanur
84c9484e55 SetPosition, final part 2020-05-05 04:45:18 +03:00
aap
702da55ec9 implemented most of vice city path system 2020-05-03 16:09:37 +02:00
Nikolay Korolev
7d067684ff Merge remote-tracking branch 'upstream/master' 2020-05-02 18:02:45 +03:00
Nikolay Korolev
f372ce156d changed saving compatibility 2020-05-02 18:02:17 +03:00
Sergeanur
d23b2c423e SetPosition, part 1 2020-05-02 15:13:09 +03:00
Sergeanur
e14733367e Rename m_phy_flagA80 to bSkipLineCol 2020-04-30 18:58:15 +03:00
Sergeanur
81094f2cd7 Rename m_ped_flagA2 into bWasStanding 2020-04-30 18:13:38 +03:00
Sergeanur
7d758f3a9f Adding getters and setters for type and status 2020-04-30 16:45:45 +03:00
Sergeanur
c94ccce6d6 Audio structs moved to their AudioManager.h 2020-04-27 20:06:54 +03:00
Sergeanur
669bbe3cc7 Workaround for a crash on release 2020-04-27 01:55:06 +03:00
aap
f03b4eec4c implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Fire-Head
75acd78190 ps2 particles, sampman oal started 2020-04-23 11:24:03 +03:00
Filip Gawin
370c4e48cd Try to build with mingw 2020-04-20 18:18:46 +02:00
erorcun
0f07a323c9
Merge pull request #474 from Nick007J/master
Bug fixes, mostly replay; added RegisterReference for player ped pointer
2020-04-19 16:56:39 +03:00
eray orçunus
1ffc37735e Struct cleanup, various fixes, enable PS2 rand 2020-04-19 16:44:35 +03:00
Nikolay Korolev
bcc3a8b6c7 missing ifded 2020-04-19 01:20:14 +03:00
Nikolay Korolev
4c133a95bd Merge remote-tracking branch 'upstream/master' 2020-04-18 23:50:58 +03:00
Nikolay Korolev
c4cd45d47c replays bug fix 2020-04-18 23:50:37 +03:00
eray orçunus
2f63e5e751 Vc ped ports and Frontend fixes 2020-04-18 21:30:03 +03:00
Filip Gawin
d6314f9564 Revert "Part one"
This reverts commit 63951d9b95.
2020-04-18 12:29:28 +02:00
Filip Gawin
2b1570de70 Merge branch 'master' of https://github.com/GTAmodding/re3 2020-04-18 12:08:38 +02:00
Sergeanur
555f933780 Remove padding fields 2020-04-18 11:31:53 +03:00
eray orçunus
812b9e7eda Various fixes 2020-04-18 05:58:43 +03:00
Filip Gawin
63951d9b95 Part one 2020-04-17 19:30:57 +02:00
Sergeanur
599164006a Remove patches 2020-04-17 16:31:11 +03:00
eray orçunus
425395ad25 Ped fixes and ref removal 2020-04-17 07:01:54 +03:00
aap
89b7085353 Merge branch 'master' of github.com:gtamodding/re3 2020-04-16 09:23:31 +02:00
Nikolay Korolev
5993c66efb
Fixed bridge despawns 2020-04-16 01:59:19 +03:00
aap
afce2e1bb3 Merge branch 'master' of github.com:gtamodding/re3 2020-04-15 22:36:21 +02:00
Nikolay Korolev
5cb7e2e42a
Merge pull request #440 from Fire-Head/master
CWeapon done, fixes
2020-04-15 23:28:09 +03:00
Fire-Head
c3647ee51e rem comment 2020-04-15 20:34:58 +03:00
eray orçunus
4da1879975 Many fixes and cleanup 2020-04-15 19:19:45 +03:00
aap
90be379bed implemented most of librw wrapper 2020-04-15 14:05:40 +02:00
Fire-Head
daed13485e CWeapon done, ps2 cheats fix 2020-04-15 08:03:53 +03:00
Sergeanur
a19fa8764f CarGen, Cranes, Gangs: cleanup, fixes, r* visioned placement 2020-04-14 13:08:03 +03:00
erorcun
313f547860
Some cleanup 2020-04-14 03:21:16 +03:00
erorcun
9044f57a0e
Merge pull request #408 from erorcun/erorcun
Revert "fix"
2020-04-12 18:53:24 +03:00
eray orçunus
bde3ef4f43 Revert "fix" 2020-04-12 18:51:46 +03:00
erorcun
0caceec1de
Merge pull request #407 from erorcun/erorcun
Ped fix
2020-04-12 18:39:23 +03:00
eray orçunus
8476283174 Ped fix 2020-04-12 18:37:59 +03:00
Nikolay Korolev
c593599fc5
Merge pull request #399 from saml1er/master
CObject complete
2020-04-12 12:05:49 +03:00
eray orçunus
f2995640bd CMenuManager done and CHud fixes 2020-04-12 00:56:27 +03:00
Sergeanur
3a4442eca4 disabling the code that freezes gang members 2020-04-10 16:14:05 +03:00
saml1er
a8f7bf0bec CObject complete 2020-04-10 16:44:08 +05:00
aap
34349c4df2 normalized line endings to LF 2020-04-09 20:50:24 +02:00
aap
6225e50723 fixed questionable RW usage; changed radar mask to PS2 techinque 2020-04-09 17:45:05 +02:00
Sergeanur
e6476bafff Cheats 2020-04-09 00:17:14 +03:00
aap
7ff5a3a65c CCamera fixes 2020-04-03 09:26:10 +02:00
eray orçunus
5e2fe749bd Mouse free cam for peds&cars (under FREE_CAM) 2020-03-31 06:05:49 +03:00
Fire-Head
194ddc5f40 CWeaponEffects(autoaim crosshair) done, CGame done. restored some original R* names 2020-03-28 23:55:23 +03:00
eray orçunus
112685ebac CCopPed done and #include cleanup 2020-03-28 18:52:25 +03:00
aap
739e80614d remove include <new> from common.h 2020-03-28 09:37:04 +01:00
aap
29f69f6216
Merge pull request #357 from aap/master
Finished CCam; various smaller things
2020-03-27 18:41:22 +01:00
aap
f0dfaac838 Finished CCam; various smaller things 2020-03-27 10:04:45 +01:00
eray orçunus
0fe55eb543 CCopPed 2 and fixes 2020-03-26 18:54:03 +03:00
aap
c7bdecdd90 fix and cleanup in AddToPopulation 2020-03-24 09:02:41 +01:00
aap
55b62e2134 added an assert to CPed::BuildPedLists, but too many peds still crash the game 2020-03-24 08:49:55 +01:00
Nikolay Korolev
861506d048 merge with upstream 2020-03-22 19:47:14 +03:00
Filip Gawin
c88c2115e2 Remove unneeded double to float casts 2020-03-22 17:30:54 +01:00
Filip Gawin
8f01eab5ab Fixes for Serge's review 2020-03-22 17:30:54 +01:00
Nikolay Korolev
d1d123dc6a missing endlines 2020-03-22 19:19:07 +03:00
Nikolay Korolev
34b1881528 CGame::Initialise 2020-03-22 17:23:40 +03:00
eray orçunus
d5a6e17079 ProcessButtonPresses and fixes 2020-03-21 14:58:54 +03:00
eray orçunus
934e9db4fc CPopulation done, CCopPed and fixes 2020-03-12 00:48:33 +03:00
Nikolay Korolev
8c13eab30a fixed dummyobject bug 2020-03-04 23:13:45 +03:00
eray orçunus
a718e699ad Fixes and cleanup 2020-03-02 03:06:52 +03:00
eray orçunus
ae523a09a7 fixes 2020-03-01 04:44:58 +03:00
eray orçunus
750d3229a3 CPopulation 3 and fixes 2020-02-27 19:38:35 +03:00
Nikolay Korolev
a122d558a2 merge + bug fix 2020-02-22 15:53:41 +03:00
Nikolay Korolev
a312e1ff81 merge 2020-02-22 15:36:22 +03:00
eray orçunus
090aef7de7 CPopulation 2 2020-02-19 21:14:17 +03:00
erorcun
16ea0527dd
Merge pull request #328 from erorcun/erorcun
CPopulation 1
2020-02-17 23:02:58 +03:00
eray orçunus
ff92b822b6 CPopulation 1 2020-02-17 15:57:50 +03:00
Nikolay Korolev
1337a9b603 script 1000-1154 2020-02-16 23:08:54 +03:00
Nikolay Korolev
85d815cf9d bug fixes 2020-02-15 23:30:51 +03:00
Nikolay Korolev
a361fc0ff5 sync with upstream 2020-02-15 14:54:46 +03:00
Nikolay Korolev
043efaf082 script 900-999 2020-02-15 14:53:42 +03:00
eray orçunus
89be27734b a fix 2020-02-13 23:34:36 +03:00
eray orçunus
f307839a2b CPlayerPed done 2020-02-13 22:02:45 +03:00
eray orçunus
9896217608 few little things 2020-02-04 00:27:48 +03:00
eray orçunus
ce0687db27 A bug fix and VC ports for veh. enter/exit 2020-02-03 21:03:48 +03:00
eray orçunus
03b995c6ef Some fixes and some cosmetic things 2020-02-02 16:58:52 +03:00
Sergeanur
2c8cce4655 suggested fixes 2020-01-30 18:15:27 +02:00
Sergeanur
81de0e0cbd acos 2020-01-29 13:00:40 +02:00
Sergeanur
8a6cec8bed CPedIK finished 2020-01-29 01:53:58 +02:00
Sergeanur
1561ab6440 Fixed autoaiming camera 2020-01-29 01:11:44 +02:00
erorcun
d75b9b8257
CPlayerPed continues (#294) 2020-01-23 23:21:50 +03:00
erorcun
2d00d7b3e2
Merge pull request #291 from Sergeanur/AccidentManager
AccidentManager
2020-01-12 02:11:47 +03:00
eray orçunus
5d119cf985 Fixes 2 2020-01-11 20:36:46 +03:00
Sergeanur
bbc68ffb1c AccidentManager 2020-01-11 15:14:02 +02:00
erorcun
f9316d9cc3
CPlayerPed & CMenuManager (#286)
Make Frontend great again!
2020-01-07 17:23:09 +03:00
erorcun
18de44e038
Merge pull request #285 from Nick007J/script_dev
600-799 script commands; bug fixes
2020-01-07 17:08:51 +03:00
Sergeanur
71889de1be Use CGeneral::faststricmp in CPed::ServiceTalking 2020-01-07 15:43:56 +02:00
Nikolay Korolev
0723dade76 script 800-899 2020-01-03 19:48:13 +03:00
Nikolay Korolev
5b0cf80a76 merge with upstream 2020-01-01 02:42:00 +03:00
Nikolay Korolev
80453d3f4d some not fully tested stuff 2020-01-01 02:35:54 +03:00
eray orçunus
bb5e31470d CPlayerPed & fixes 2019-12-28 23:05:49 +03:00
eray orçunus
04499bfbb6 CEmergencyPed done 2019-12-22 18:28:16 +03:00
eray orçunus
6cbf1db519 CPlayerInfo done 2019-12-16 07:48:44 +03:00
eray orçunus
dad7782ff0 CPhone, CPlayerInfo, CFire, CWorld 2019-12-06 00:55:23 +03:00
Filip Gawin
c7e9ddb566 Audio fixes for erorcun review 2019-12-01 20:44:57 +01:00
eray orçunus
6496143022 Shadow/blood fade and scale fix 2019-11-28 00:22:38 +03:00
eray orçunus
680fe0f7e6 CCivilianPed done & restore peds running to phone 2019-11-26 02:35:05 +03:00
eray orçunus
bd68b56b5d CPed completed!
And a few fixes
2019-11-21 00:05:10 +03:00
eray orçunus
030f64daf1 Frontend, Peds & logic and overflow fixes 2019-11-13 01:16:23 +03:00
erorcun
0df15bb73d
Merge pull request #263 from Sergeanur/strcmp
Implemented faststrcmp, faststricmp, strcasecmp
2019-11-09 18:06:20 +03:00
eray orçunus
d5619fb5ae Peds & a few fixes 2019-11-05 03:52:06 +03:00
eray orçunus
ad69a319cb The Peds 2019-10-30 02:41:47 +03:00
Sergeanur
c202fc3b55 Implemented faststrcmp, faststricmp, strcasecmp 2019-10-30 01:35:31 +02:00
eray orçunus
36e136a06c Fall damage fix 2019-10-27 18:00:31 +03:00
Fire_Head
6a46cc6c3b
Merge branch 'master' into master 2019-10-27 06:36:58 +03:00
Fire-Head
537aaca5c2 ControllerConfig done
Fix Cam enum
2019-10-27 06:17:30 +03:00
eray orçunus
5fa56e4173 Gang attack fix & SeekCar 2019-10-26 18:43:25 +03:00
Sergeanur
d5a72fa597 Audio stuff moved around, removed MusicManager dependencies, eMusicMode used for ChangeMusicMode 2019-10-26 15:20:12 +03:00
Sergeanur
f62555c28e CPedIK limb movement info reversed 2019-10-26 14:13:00 +03:00
Filip Gawin
8808e6fdfe Fixes for aap review (audio8) 2019-10-26 13:05:00 +02:00
Filip Gawin
d2941b0368 More audio (to hook and test) 2019-10-26 13:05:00 +02:00
eray orçunus
2d998b2416 Fixes&Peds 2019-10-25 22:17:55 +03:00
Nikolay Korolev
63e39fd8bf fixed adrenaline 2019-10-19 12:37:31 +03:00
erorcun
38565a47a1
Merge branch 'master' into master 2019-10-16 23:42:04 +03:00
eray orçunus
b43ad08c03 Peds 2019-10-16 20:18:03 +03:00
Nikolay Korolev
f93285df79 Merge remote-tracking branch 'upstream/master' into script_dev 2019-10-14 00:44:48 +03:00
eray orçunus
37f0bbc05e PathFind fix and some Peds 2019-10-14 00:33:18 +03:00
Nikolay Korolev
8eda735918 400-499 2019-10-13 14:46:09 +03:00
eray orçunus
0562a6e983 Peds&fixes 2019-10-13 07:17:53 +03:00
Sergeanur
4ca7304e43 Fix uninitialized orderInCat 2019-10-12 23:10:25 +03:00
Nikolay Korolev
a1700eeaa4 Merge branch 'master' into script_dev 2019-10-12 22:24:58 +03:00
Nikolay Korolev
c78fff8d54 script 400-499 start 2019-10-12 22:00:31 +03:00
Sergeanur
35add59b34 Removed !this check in CVehicle::IsWrecked, added CPed::IsNotInWreckedVehicle instead 2019-10-12 17:03:32 +03:00
erorcun
f70c2ad54f
Merge pull request #230 from Nick007J/master
CCarAI, CCurves, CAutoPilot
2019-10-11 02:39:16 +03:00
Nikolay Korolev
803412f33b CCarAI + bugfixes 2019-10-11 00:02:55 +03:00
Sergeanur
101192dd32 Added read/write template functions for save data, small Load/Save arguments unification 2019-10-08 23:07:11 +03:00
Sergeanur
69963cea68 Full CGameLogic 2019-10-08 17:13:23 +03:00
Sergeanur
3e25726697 Fixed crash when aboarding train 2019-10-08 02:19:44 +03:00
eray orçunus
c9d92a7d1b Little fix 2019-10-07 01:13:18 +03:00
eray orçunus
d5d1c7ec5f Peds 2019-10-07 00:39:25 +03:00
eray orçunus
42fbe50739 Fixes 2019-10-05 21:50:02 +03:00
eray orçunus
aa4e7ad5eb CDarkel, walkaround fix 2019-10-05 17:06:01 +03:00
eray orçunus
0ee5a46f71 Fixes & peds 2019-10-03 04:02:02 +03:00
eray orçunus
d0addb8bf5 Mostly fix 2019-10-01 23:33:00 +03:00
eray orçunus
c03efd0aa1 Moar peds 2019-10-01 19:16:36 +03:00
eray orçunus
0c385195d8 Peds, ProcessObjective and fixes 2019-09-27 00:01:50 +03:00
eray orçunus
3cb0a62ee6 Peds 2019-09-20 22:40:33 +03:00
eray orçunus
0f9178568b Peds, a fix and a tad of VC 2019-09-17 23:22:34 +03:00
eray orçunus
88f0ef75e8 P.e.d.s. 2019-09-14 02:24:53 +03:00
eray orçunus
643f8e14a0 Little cleanup 2019-09-12 15:35:05 +03:00
eray orçunus
14c7c1d7ca World and Peds 2019-09-12 03:46:15 +03:00
eray orçunus
24d9773ae0 Peds 2019-09-07 01:27:07 +03:00
eray orçunus
0f028edae9 Fix and cancellable car enter 2019-09-05 23:07:37 +03:00
eray orçunus
e232b664be CPed::ProcessControl and some cleanup 2019-09-03 23:05:17 +03:00
Filip Gawin
01ac2929cd Cleanup 2019-08-27 22:29:23 +02:00
Filip Gawin
2fabbc3b4c More more more audio 2019-08-27 21:18:47 +02:00
Filip Gawin
458fc63f01 Cleanup 2019-08-27 21:14:28 +02:00
Filip Gawin
af5bd951ae More audio ped 2019-08-27 21:13:17 +02:00
eray orçunus
e5df72a1e9 Peds 2019-08-23 01:53:53 +03:00
aap
ed9ab6c55f
Merge pull request #195 from erorcun/erorcun
AnimViewer messages, Particle fix, Peds
2019-08-17 21:24:26 +02:00
eray orçunus
39223901bf AnimViewer messages, Particle fix, Peds 2019-08-17 22:21:10 +03:00
Nikolay Korolev
13233ccaed merge 2019-08-17 15:46:19 +03:00
Nikolay Korolev
c16849d4a2 more CCarCtrl 2019-08-17 15:44:25 +03:00
eray orçunus
cf8b27c453 Little CPed fixes & Peddebug 2019-08-16 19:25:02 +03:00
Fire_Head
6909fa283a
Merge branch 'master' into master 2019-08-15 05:06:52 +03:00
Fire-Head
6093d855b0 CParticleObject done, cDMAudio done 2019-08-15 04:43:00 +03:00
eray orçunus
e5d089db88 More peds 2019-08-13 01:30:31 +03:00
eray orçunus
2c24f55333 Ped variables fix 2019-08-12 00:35:32 +03:00
eray orçunus
be1c7b0761 P.e.d.s. and fixes 2019-08-11 20:31:36 +03:00
aap
0bd681abc5 finished CPathFind 2019-08-09 19:42:18 +02:00
eray orçunus
2ba54983a2 Peds 2019-08-08 14:46:49 +03:00
eray orçunus
2fc69a0aa5 CPed part 218 2019-08-05 16:07:10 +03:00
eray orçunus
ca52dea51b A fix and a function made me notice it 2019-08-03 20:14:45 +03:00
Nikolay Korolev
ebbcd92de2 RunningScript, part 4, plus some fixes 2019-08-03 16:01:13 +03:00
aap
6f05ed0c23 some CPed cleanup 2019-08-02 15:00:55 +02:00
eray orçunus
875cdd845d The Peds 2019-08-02 01:30:40 +03:00
aap
5f6b235301 implemented CTrain 2019-07-31 14:33:27 +02:00
eray orçunus
72822c20d8 Peds and fixes 2019-07-29 15:01:44 +03:00
eray orçunus
994dce6bc4 Address fix 2019-07-28 21:01:55 +03:00
eray orçunus
8102ace7b6 Peds, mainly audio 2019-07-28 20:39:39 +03:00
Nikolay Korolev
aac7acd785 ped chat fix 2019-07-28 19:51:13 +03:00
aap
6ff921c160 CAutomobile::PreRender; whole class finished 2019-07-28 13:14:08 +02:00
aap
e200eb1a2f CAutomobile effect stuff 2019-07-26 18:48:14 +02:00
Nikolay Korolev
dae2d30d8f fight fix 2019-07-26 13:39:56 +03:00
aap
8804aafc6a
Merge branch 'master' into master 2019-07-26 01:34:32 +02:00
eray orçunus
8fd63e5ca6 Ped & fixes, including peds dive into danger fix 2019-07-25 23:37:50 +03:00
Nikolay Korolev
5acce16261 Running script part 3 2019-07-25 23:34:29 +03:00
eray orçunus
936acedcf0 CPed continues, including some fixes 2019-07-21 00:32:16 +03:00
Nikolay Korolev
b0f3ecdb63 fix door issue 2019-07-20 23:12:12 +03:00
aap
b62634ea64 one more fix 2019-07-20 14:48:29 +02:00
aap
59145cea83 CAutomobile ctor, car spawner, fixes 2019-07-19 11:57:12 +02:00
eray orçunus
d0fd14cb1a Wanted changes in PlayerPed/PedModelInfo
And some typos
2019-07-18 16:12:46 +03:00
eray orçunus
59671fab03 The Peds, mainly dying/injuring
There is also some reorganization
2019-07-18 05:27:29 +03:00
aap
0f1fbf5e9a renamed some variables and added files; more CAutomobile::ProcessControl 2019-07-17 13:19:20 +02:00
aap
36f3a517f9 more fixes; started CAutomobile::ProcessControl 2019-07-16 19:48:50 +02:00
aap
03fc85bfe0 fixed merge 2019-07-16 18:41:30 +02:00
aap
9477aca836
Merge branch 'master' into erorcun 2019-07-16 18:31:18 +02:00
eray orçunus
2c138b2b77 Phone, World, Ped 2019-07-15 15:11:40 +03:00
Nikolay Korolev
e16562aa6d fixed cops 2019-07-14 15:00:36 +03:00
Nikolay Korolev
b77a9ce955 RunningScript 2. So far with bugs (cops not caring, errors in arithmetical opcodes) 2019-07-14 14:49:27 +03:00
Nikolay Korolev
41dbd754de Partial RunningScript part2 2019-07-14 12:49:03 +03:00
aap
60711154ba more CWanted; added CEventList 2019-07-12 18:01:22 +02:00
aap
0548476ba6 CAutomobile::ProcessControlInputs 2019-07-11 12:48:49 +02:00
aap
90e093cd47 and of course the last commit didnt fix everything 2019-07-10 17:34:11 +02:00
aap
4a36d64f15 added wrappers around math functions 2019-07-10 17:18:26 +02:00
eray orçunus
2ef5e4cd66 Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun 2019-07-10 15:56:56 +03:00
eray orçunus
86681c6f18 Phone start, ped spinning and cop car fix, and some love to CPed
Signed-off-by: eray orçunus <erayorcunus@gmail.com>
2019-07-10 15:56:29 +03:00
Nikolay Korolev
ca4c7d9a4b sync with upstream 2019-07-09 23:39:29 +03:00
Nikolay Korolev
11ae1b06ae RunningScript: 1/12 2019-07-09 23:38:05 +03:00
aap
a65dd41da7 yet more CAutomobile 2019-07-09 18:50:35 +02:00
aap
74fcbc8c0a more CAutomobile 2019-07-09 09:57:44 +02:00
aap
2ae112fdf6 more CAutomobile 2019-07-08 21:37:47 +02:00
aap
edf5ac2626 little changes; one more function of CAutomobile 2019-07-08 17:07:34 +02:00
aap
12af85ca3d cleaned up patching of virtual functions; started CAutomobile 2019-07-08 08:46:42 +02:00
_AG
0c34fb1bb2 blah 2019-07-07 15:26:59 +02:00
_AG
d1c6a6aaa6 Merge branch 'master' of https://github.com/gtamodding/re3 2019-07-07 15:16:54 +02:00
aap
53023eb65b the great reorganization 2019-07-07 13:09:11 +02:00