edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3507 commits 1 branch 429 tags 411 MiB
Commit graph

366 commits

Author SHA1 Message Date
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
GreYFoXGTi 5e841fcfae Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-12-19 15:22:31 +02:00
heinrich5991 bf62514088 added some DDRace flags for the server browser (server-sided), client-sided still needed 2010-12-19 14:11:14 +01:00
floff 4008a1dc95 spectator votes configurable 2010-12-16 10:06:24 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
GreYFoXGTi 122c7954d9 Announcement Randomness 2010-12-06 04:27:35 +02:00
GreYFoXGTi 881fd901a6 added Vote comments starting with # and also made announcement comments start with # 2010-12-06 00:38:29 +02:00
GreYFoXGTi dd849d3915 Merge branch 'master' of http://github.com/heinrich5991/DDRace into DDRace 2010-12-04 23:54:06 +02:00
heinrich5991 311d92cf47 removed response message after typing "kill" in chat 2010-12-04 20:52:23 +01:00
GreYFoXGTi 83cea23373 Reworked some stuff 2010-12-03 14:58:38 +02:00
GreYFoXGTi 8542181d9a Added include recommended by SushiTee to fix the following mac compiling Errors 
#1 c++ src/game/server/gamecontext.cpp
In file included from src/base/tl/range.h:6,
                 from src/base/tl/algorithm.h:6,
                 from src/base/tl/sorted_array.h:6,
                 from src/game/server/score/file_score.h:6,
                 from src/game/server/gamecontext.cpp:18:
src/base/tl/base.h:8: error: expected `)' before ‘(’ token
bam: 'objs/game/server/gamecontext.o' error 256
 2010-12-02 20:51:21 +02:00
GreYFoXGTi 388ca1288f Fixed Tile Parsing Error and Added dbg Messages to show map tiles 2010-12-02 01:33:02 +02:00
GreYFoXGTi af6f96bc7e Added Tile for the new Map Config 2010-12-02 00:45:36 +02:00
GreYFoXGTi b4fd1aaca9 Fixed Announcement System 2010-11-29 05:39:47 +02:00
GreYFoXGTi 94d5351108 Just to be sure this doesn't make an infinite loop 2010-11-29 05:25:27 +02:00
GreYFoXGTi 4f777211a5 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-25 00:22:02 +02:00
heinrich5991 5204bbe6b7 fixed rcon command "set_team" 2010-11-24 23:17:56 +01:00
heinrich5991 73ca31d168 changed rcon command "cmdlist" nearly completly 2010-11-24 22:09:31 +01:00
GreYFoXGTi a3d29d5447 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-23 03:57:48 +02:00
heinrich5991 077b8bd84d fixed sv_vote_percentage 2010-11-22 22:30:50 +01:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi eed83bd7cb Added Announcement 2010-11-22 13:00:43 +02:00
GreYFoXGTi b8fe169419 Added Mac Fixes by Allisone (Trust) 2010-11-22 11:09:27 +02:00
GreYFoXGTi 3ceebe2ef4 Forgot to make the map.cfg level 4 2010-11-22 10:32:00 +02:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
Choupom c64d3817cf fixed so we can't add a vote option multiple times by oy 2010-11-20 21:41:18 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi d414579247 Added ### after *** to indicate a /me message, and avoid messages that look like the server sent it 2010-11-19 18:57:53 +02:00
GreYFoXGTi ac341b5390 fixed mac compilation 2010-11-18 01:19:44 +02:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
 2010-11-18 01:10:59 +02:00
oy 994a44f6e1 simplified change_map command so that it switches to the next map in the maprotation when called without param 2010-11-17 12:50:01 +01:00
GreYFoXGTi 4cbcbae508 Fixed sv_vote_percentage 2010-11-16 16:59:17 +02:00
GreYFoXGTi 0c6767dd9d Added option to have DDRace Compiled without SQL 2010-11-16 15:44:16 +02:00
GreYFoXGTi 5ee8796381 Removed sql from mac, people who need sql compile the Mac branch 
the boost stuff made my working dir very messy and searching through it takes more time
 2010-11-16 15:26:19 +02:00
GreYFoXGTi bf4ed7515c Forgot to parse the tiles from the Switch layer ^^ 2010-11-14 16:00:33 +02:00
GreYFoXGTi 670e90c7e3 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/door.cpp
 2010-11-14 03:32:00 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
btd 002cf9792f Fix project tile 2010-11-13 18:41:43 +03:00
btd e3fb77f444 Merge branch 'master' of github.com:btd/DDRace 2010-11-13 18:31:25 +03:00
btd 2c44c94c4e Move console staff 2010-11-13 18:31:13 +03:00
btd 325aa980e9 Fix door issue. Fix explosion-team issue. Fix null pointer bug. Fix predicion bug. Fix crash when character killed and snap in this moment 2010-11-13 00:54:33 +03:00
heinrich5991 c54b824a45 fixed 'cmdlist' rcon command for joining clients 2010-11-11 23:22:09 +01:00
btd cd59d111a8 Fix explosion issue. Dont pull, not tested. Can pull if test both commits=) 2010-11-11 12:12:03 +03:00
heinrich5991 e078d537c2 moved spam protection and re-added it for /rank and /me; some smaller fixes 2010-11-10 22:42:29 +01:00
GreYFoXGTi 17cb8a6ffb Merge branch 'develop' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-11-09 17:30:30 +02:00
GreYFoXGTi 27864ec70d Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-09 00:24:42 +02:00
GreYFoXGTi 86675f7dd7 Able to amend the mute to something less 2010-11-08 11:29:09 +02:00
heinrich5991 50b8d93d6d finished system to generalize rcon commands, sorry for last commit's description 2010-11-07 17:35:11 +01:00
heinrich5991 470e2773ba added system to generalize rcon commands 2010-11-07 17:08:09 +01:00
heinrich5991 678c94b344 removed the senseless parameters of CGameContext::CheatsAvailable 2010-11-07 13:21:25 +01:00
heinrich5991 b9875cefd8 fixed a bit ugly code 2010-11-07 12:03:26 +01:00
btd 5f6e35b418 Finish sv_team 2010-11-07 01:54:35 +03:00
GreYFoXGTi 96e67724f1 Merge branch 'rm_clientdummies' of https://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
moved and edited src/game/ddracecommands.h
 2010-11-05 01:59:37 +02:00
GreYFoXGTi 9feef5638e Merge branch 'master' of http://github.com/btd/DDRace 2010-11-04 21:18:55 +02:00
btd 32d80c22d1 score board 2010-11-04 21:33:51 +03:00
GreYFoXGTi 32429ebe31 /me is a number of word, parameter = r not s 2010-11-04 20:24:13 +02:00
heinrich5991 60d7639c9b moved ddrace-specific rcon cmds from 'game/server/gamecontext.cpp' to 'game/server/ddracecommands.h' in order to remove renundancy with client-side server dummies for tab-completion 2010-11-02 17:07:45 +01:00
heinrich5991 d2e24f0318 added rcon commands 'move' and 'move_raw', re-implemented 'up', 'down', 'left', 'right' 2010-11-01 21:09:44 +01:00
heinrich5991 c9dd108e09 added CGameContext::MoveCharacter, fixed CGameContext::ModifyWeapons 2010-11-01 20:44:36 +01:00
GreYFoXGTi 46d66aa06e Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-11-01 20:07:57 +02:00
heinrich5991 7167cb827c re-implemented rcon weapon functions with the new function CGameContext::ModifyWeapons 2010-11-01 18:22:40 +01:00
heinrich5991 9a38340c57 added CGameContext::ModifyWeapons in order to generalize rcon<-> weapon system 2010-11-01 18:07:09 +01:00
GreYFoXGTi 96eeec6a39 Entities: Fisico 2010-11-01 17:29:09 +02:00
GreYFoXGTi a89da52480 credits update 2010-11-01 16:52:58 +02:00
GreYFoXGTi beb5712a79 i thought i added those like 10 years ago 2010-11-01 13:00:37 +02:00
GreYFoXGTi e43bcd80db Rotation 
FTW
 2010-11-01 03:51:17 +02:00
btd 62ef58329d Return DDRace stuff. No need in mistic compatibility 2010-10-31 23:50:40 +03:00
GreYFoXGTi 85df8a047d Fixed btd's last commit and ensured RaceClient Support(tested) 2010-10-30 21:44:46 +02:00
GreYFoXGTi 8640930779 Merge branch 'master' of http://github.com/btd/DDRace 2010-10-30 20:23:28 +02:00
GreYFoXGTi 8d88f5d541 Partially Revert "Refactoring" to keep DDRace compatible with SushiTee's Stuff 
This partially reverts commit 505a5b4172.
 2010-10-30 20:17:59 +02:00
btd 86365bedcd Add Race stuff but fully reworked. Still only need to make score board 2010-10-30 18:22:35 +04:00
GreYFoXGTi 505a5b4172 Refactoring 2010-10-29 23:29:07 +02:00
GreYFoXGTi d102267139 Moved stuff around 2010-10-27 12:14:26 +02:00
btd b8dd4a32ca Merge https://github.com/GreYFoXGTi/DDRace into others 2010-10-26 23:35:55 +04:00
GreYFoXGTi 4d204d642f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/console.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
 2010-10-26 00:25:36 +02:00
oy 8ca6a28088 parse line on addvote and skip invalid ones 2010-10-25 18:30:35 +02:00
btd a62decbc91 Show others for ddrace clients. 
Need to fix entities now.

Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-24 14:47:25 +04:00
btd 61092f7baa Begin show_others 
Signed-off-by: btd <bardadymchik@gmail.com>
 2010-10-23 23:26:10 +04:00
GreYFoXGTi 339c93652e fixed kick vote bug 
thanks egoBlend.{626} => EIMER reported
 2010-10-20 18:07:44 +02:00
GreYFoXGTi a277c7672c Declared Alpha Testing Stage 2010-10-19 02:03:59 +02:00
GreYFoXGTi 8575edcf63 Re-Arranged Some Names due to in activity 2010-10-19 01:53:00 +02:00
GreYFoXGTi 7f437f7245 Merge branch 'master' of http://github.com/heinrich5991/DDRace 
Conflicts:
	src/game/server/gamecontext.cpp
 2010-10-16 22:02:34 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
heinrich5991 14c0f77c45 added config command "clear votes" 2010-10-14 12:11:17 +02:00
heinrich5991 0cd8390036 Revert "better spam protection. Closes #82. Feedback Please" 
This reverts commit daac101024.
 2010-10-14 08:42:29 +02:00
oy fa768449e2 fixed issue with reason on forcevotekick 2010-10-13 20:31:21 +02:00
GreYFoXGTi daac101024 better spam protection. Closes #82. Feedback Please 2010-10-12 16:13:56 +02:00
GreYFoXGTi d1129b7fce *whistling*, the obvious cover up. 2010-10-12 11:48:45 +02:00
GreYFoXGTi e9523454f1 Enhanced CMDList but still this causes too weak connection (out of buffer) need to think of a better way 2010-10-12 10:44:24 +02:00
GreYFoXGTi 5cf469fa11 Re-Added Command CMDList 2010-10-12 10:25:48 +02:00
GreYFoXGTi dc12d59a00 registered server dummy commands for tab completion in the client 2010-10-12 10:02:46 +02:00
GreYFoXGTi 84ff10ca48 Changed rcon system a bit like the old one 2010-10-12 09:31:47 +02:00
GreYFoXGTi ce03f911d8 lol :) 2010-10-11 20:19:13 +02:00
GreYFoXGTi c1b7012dee the offspring of sleepless commits 2010-10-11 19:43:29 +02:00
GreYFoXGTi 01158b0ce1 Merge branch 'master' of http://github.com/heinrich5991/DDRace 2010-10-11 19:41:52 +02:00
GreYFoXGTi a129e59d7c Fixed Voting 2010-10-11 13:10:39 +02:00
heinrich5991 43cf69596e "admins can call any vote" fixed 2010-10-11 11:18:44 +02:00
heinrich5991 085601eced all old chat commands re-added, admins can call any vote, fixed compare_players, logout level setted to 0 2010-10-11 10:37:33 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
GreYFoXGTi 954785f75e Can't Leave Spectator's Team if you have done /pause. CLoses #86. 2010-10-11 02:49:20 +02:00
GreYFoXGTi 040ba467bf Changed The lowest level to -1 ( has chat but no rcon ) 
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
 2010-10-11 02:39:08 +02:00
oy b65a26fe93 fixed last commits 2010-10-11 01:06:44 +02:00
GreYFoXGTi 332fb1de09 chat commands redirect to rcon and vice versa by heinrich5991 2010-10-11 00:40:07 +02:00
Choupom 61201fea13 added reason to kick a player in the callvote tab 2010-10-11 00:31:21 +02:00
GreYFoXGTi ef139eb73a Cleanup (Putting stuff back vanilla like) 2010-10-10 16:11:11 +02:00
GreYFoXGTi 99f044bf88 added kill delay config with default 3 2010-10-08 18:56:56 +02:00
GreYFoXGTi bd32632da2 added configurable suicide penalty with default 0, Closes #61. 2010-10-08 18:52:26 +02:00
GreYFoXGTi 48b205fac4 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 15:34:11 +02:00
GreYFoXGTi cf08ccb597 Fixed Doors + Switches creation, Closes #77. 
DDRace.cpp and gamecontext.cpp cleanup, old comments that are not needed
 2010-10-07 15:22:03 +02:00
GreYFoXGTi 76f1dff55e Merge branch 'master' of http://github.com/btd/DDRace 2010-10-07 14:31:50 +02:00
btd fb93343873 Make work chat all and chat team both 2010-10-07 16:10:49 +04:00
GreYFoXGTi c836c7f1f7 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-07 04:02:49 +02:00
GreYFoXGTi ee6cb26e90 Can;t Super again if you are super 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-07 04:02:24 +02:00
GreYFoXGTi 59bd0f1c87 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 2010-10-06 22:48:24 +02:00
btd c4b6094ebb Make team chat working properly. 
If you in team 0 your messages for all if not in team 0 your messages only for team members
 2010-10-07 00:35:19 +04:00
btd 538efe273b Clean Tele Layer initialization and holding. 2010-10-04 23:17:56 +04:00
btd 6969851ca3 Clean up Doors and Teleport initialization. 2010-10-04 22:37:39 +04:00
GreYFoXGTi dff5a70b91 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2010-10-02 03:32:44 +02:00
GreYFoXGTi badfdcb968 you need to be super to be able to unsuper 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-02 02:07:59 +02:00
GreYFoXGTi d20b7360b8 unsuper me now returns you to the previous team 
forgot some dbgmsg
 2010-10-02 02:06:42 +02:00
GreYFoXGTi 0763a62601 fixed unsafe /team 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-10-02 00:45:11 +02:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
GreYFoXGTi ac36e562a5 Made Personal Best/Vanilla Score Updated on game enter 2010-09-27 00:31:33 +03:00
btd e039cf6f35 Fix loading client score. Thanks GreYFoX 2010-09-26 18:36:28 +03:00
GreYFoXGTi 7ecae53f6c Some People just don't know when they have to sleep xD 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-26 17:30:43 +03:00
GreYFoXGTi e9083caa1d some little stuff 2010-09-25 18:55:36 +03:00
btd af843600e7 Add reset in Server OnInit. If i am right this solve issues with collision 2010-09-24 17:37:13 +04:00
btd 24b4c7ac71 Fix not alive team joining. Closes #45 2010-09-24 10:06:16 +04:00
GreYFoXGTi 806046fe76 Merge branch 'master' of http://github.com/btd/DDRace 
Conflicts:
	src/game/server/entities/dragger.cpp
	src/game/server/gamecontext.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 03:02:49 +03:00
GreYFoXGTi f0a4ae847b i always forget linux needs this 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 02:16:03 +03:00
btd 2af441b703 Finish super team, fix bug with killing, DDraggers not finished 2010-09-21 23:09:11 +04:00
GreYFoXGTi b32f9d4184 Revereted the reconnect feature because after testing it, i found out that currently it is not so useful, and i don't have time to make it work for dynamic ips atm 
so revert it for now maybe later i will fix it

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 22:13:28 +03:00
GreYFoXGTi 0c0e48ffb5 Fixed vote 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 22:40:37 +03:00
GreYFoXGTi d9af926f6f FiX 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 22:22:28 +03:00
GreYFoXGTi 5a9c1d0dc1 Optimizations and Fixes 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 20:58:49 +03:00
GreYFoXGTi f657cb05a5 Enhanced Console Prints and dbg_msgs 2010-09-17 17:37:03 +03:00
GreYFoXGTi 1eb4441d14 Removed auth and added logout, helper, moder and admin 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 17:23:07 +03:00
GreYFoXGTi b73ce9b42f Implemented auth id 0 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 16:47:31 +03:00
GreYFoXGTi 82403b81f0 Added sv_vote_percentage 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 14:44:30 +03:00
GreYFoXGTi a0329fece4 Added /Fly for super Players only to make them choose if they want to fly 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 14:35:53 +03:00
GreYFoXGTi b7d5a3f7d2 Improved Reconnection Reload 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 12:58:54 +03:00
GreYFoXGTi e061d84f20 Added Ability to Reconnect in the same place as your disconnect 
Decided by sv_max_dc_restore

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 12:34:13 +03:00
GreYFoXGTi 4f22df654e Fixed /pause crash in spectator with out using /pause 1st. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 09:05:27 +03:00
GreYFoXGTi ba65baea2c ignored empty /me 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 05:02:09 +03:00
GreYFoXGTi 86720a99e7 Merge branch 'master' of http://github.com/Speedy-Consoles/DDRace. Closes #40. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 04:15:37 +03:00
Speedy Consoles 80164be172 fixed a description of chat commands 2010-09-17 03:13:47 +02:00
GreYFoXGTi eca172c8b5 removed unused includes 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 04:09:10 +03:00
GreYFoXGTi f0819384e8 added /me 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-17 03:59:43 +03:00
Speedy Consoles fcb82f1221 changed server commands description and order 2010-09-17 00:58:54 +02:00