Commit graph

4971 commits

Author SHA1 Message Date
timgame 2ee0ca0648 added refill jumps tile and cleaned tile detection 2015-01-19 22:14:49 +01:00
def 78faf6b0bd Version 6.6.7 2015-01-19 22:14:49 +01:00
def 27ac37a9f0 Oops 2015-01-19 22:14:49 +01:00
def b4f7321dd6 Revert "Add unicode support for console output on windows"
This reverts commit 92cdb15679.

Conflicts:
	src/base/system.c
2015-01-19 22:14:49 +01:00
eeeee 073a552b82 fix mac os build 2015-01-19 22:14:49 +01:00
def c8405ce13e Add cl_show_broadcasts, but don't save it 2015-01-19 22:14:49 +01:00
def 99a77bdcbf Version 6.6.6 (someone waited for this) 2015-01-19 22:14:48 +01:00
def 72278a18cb Fix cl_default_zoom bug 2015-01-19 22:14:48 +01:00
def 47bc43a5af Version 6.6.5 2015-01-19 22:14:48 +01:00
def ce13aa6809 Fix: Not jetpack prediction on DDNet incompatible servers 2015-01-19 22:14:48 +01:00
def 4ee13df329 Fix text message about ninja jetpack 2015-01-05 13:30:38 +01:00
def 0ed314eef9 Add default zoom setting 2015-01-03 03:13:21 +01:00
def 592ab36c7e Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-31 14:49:44 +01:00
def bd62b5da79 Clean up a few compile warnings 2014-12-31 13:04:31 +01:00
def b3581f6dba Minor optimization suggested by CytraL 2014-12-30 14:43:02 +01:00
def f0d830021a Fix old bug 2014-12-29 20:06:00 +01:00
def 66be23c5d5 Remove unused members 2014-12-29 02:21:10 +01:00
def 55bfd2cf01 Always call freeaddrinfo 2014-12-28 01:40:15 +01:00
def 79aeb5ea38 Add hook duration tune 2014-12-27 12:05:02 +01:00
def 75ea9719db Player can be NULL, prevent crashes 2014-12-27 02:50:59 +01:00
def 77d43957fe Version 6.6.4 2014-12-26 12:12:45 +01:00
def 63a25fc1d4 Make server sleep for the proper time when no player is connected (fixes master server registration on Windows) 2014-12-26 12:12:28 +01:00
def 47842eeac6 Revert "Try only to make performant server on non-Windows"
This reverts commit d9e207816e.
2014-12-26 02:25:19 +01:00
def d9e207816e Try only to make performant server on non-Windows 2014-12-26 00:53:03 +01:00
def 6dc501f286 Fix: Actually should spam protect sql messages 2014-12-25 14:56:31 +01:00
def 292c18a1e0 Make prediction work with unsolo command 2014-12-25 11:37:44 +01:00
def 9d762b79b4 Version 6.6.3 2014-12-25 00:39:06 +01:00
def 6048e635c9 Fix friend display when clan doesn't match 2014-12-25 00:38:05 +01:00
def ebf331febb Show the function of search and exclusion edit boxes when empty (Suggestion by Saavik) 2014-12-24 03:38:40 +01:00
def 5882dec451 Version 6.6.2 2014-12-24 01:46:22 +01:00
def 4c2f83714d Fix typo 2014-12-24 01:40:21 +01:00
def 215173428b Version 6.6.1 2014-12-23 16:01:21 +01:00
def 7f0b1dd35f Another color change 2014-12-23 16:00:59 +01:00
def cc7abaef1f Another color change in editor selections 2014-12-23 15:38:59 +01:00
def e24de30f86 Still allow to find clan mates when clan is ignored in friends 2014-12-22 18:18:01 +01:00
def 66a4d5b566 Highlight broadcasts in console as well 2014-12-22 18:07:22 +01:00
def 8c43fcde8b Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-22 16:43:25 +01:00
def 9d541da42d Version 6.6 2014-12-22 16:43:02 +01:00
eeeee fabcfc1cbc Update fifoconsole.cpp
actually store the pointer in the field
2014-12-21 17:21:19 -08:00
def a44773e455 "Reset filter" also resets exclusion lists 2014-12-21 18:40:00 +01:00
def 023f926e89 Fix Compilation 2014-12-20 16:35:47 +01:00
def c004a352d2 Highlight in console 2014-12-20 13:37:11 +01:00
def 90d6878fed Fix: Save that you were on settings tab 2014-12-20 13:18:08 +01:00
def 795fc9702b Add forgotten files 2014-12-20 11:47:52 +01:00
def df754072e0 Update zlib to version 1.2.8 2014-12-20 04:13:19 +01:00
def e5aa762cf1 Make non-sql server comile again 2014-12-19 21:58:48 +01:00
def ee6eae1cee Fix cl_friends_ignore_clan 2014-12-19 17:56:29 +01:00
def ec53836d83 Don't lose memory 2014-12-19 17:51:04 +01:00
def 8f72b2fdb6 Fix 2014-12-19 17:47:11 +01:00
def 87afb28a40 Further save cleanup 2014-12-19 17:43:23 +01:00
def da0750d26f Remove buggy and unneeded finish time in /rank and /rankteam 2014-12-19 16:27:10 +01:00
def 75bbf64bbd Allow to set country where you can load savegame 2014-12-19 11:30:14 +01:00
def b0ae9d095f Don't spam protect sql messages 2014-12-18 15:52:24 +01:00
def 2750a23792 Only allow savegames on same server. Clean up saving a bit and prevent another possible exploit 2014-12-17 20:38:05 +01:00
def f397838741 Browser: Flexible map column size 2014-12-15 21:24:04 +01:00
def 936b32ec48 Remove "pure" exclamation mark in browser 2014-12-15 20:58:33 +01:00
def fe86eef7d8 Disable hook when /spec is used 2014-12-15 20:49:16 +01:00
def a6b4adb5d8 Minor cleanups 2014-12-15 20:48:58 +01:00
def 3e410bbd34 Add detection whether an image and sound has to be embedded and redesign colors 2014-12-15 18:59:21 +01:00
def f9562198ad Version 6.5 2014-12-14 19:17:02 +01:00
def b694c865b4 Fix distance in menu 2014-12-14 17:34:50 +01:00
def e816e2e0e0 Clean up menus 2014-12-14 17:16:44 +01:00
def ad50badc05 Remove colorization options from server filter 2014-12-14 16:55:10 +01:00
def 8d945fe968 Exclude DDNet servery by type 2014-12-14 16:45:18 +01:00
def 3b0f768478 Add setting to ignore clan in friends and enable by default 2014-12-12 17:15:29 +01:00
def dfa804fb58 Add missing file 2014-12-10 11:21:13 +01:00
def 76b6a99f26 Add Exclusion filter strings and clean up menu a bit 2014-12-10 04:49:16 +01:00
def 8b108a2311 Clean up gametype determination 2014-12-10 03:39:15 +01:00
BeaR cd32f6d79a Cleanup grenade prediction, now also correctly shows smoke trails 2014-12-08 19:14:44 +01:00
BeaR 0b00f17627 Fix visual studio build (C89-compatibility) 2014-12-08 18:44:01 +01:00
def 3a5b3735ed Fix: Client & Server quit properly 2014-12-08 13:53:19 +01:00
def eb12370db0 Rename cl_antiping to cl_antiping_players and add cl_antiping metasetting 2014-12-08 13:49:39 +01:00
def 9d488d7a28 No one cares about the TOS value but shouldn't hurt to set it 2014-12-07 14:19:03 +01:00
def 87ebb2f03e Defer character kill from thread to prevent race conditions 2014-12-07 03:42:43 +01:00
def 6ecd02d410 No threaded debug output with fuzzing 2014-12-06 19:45:52 +01:00
def f32b09206a Fuzzing optimization 2014-12-06 19:29:20 +01:00
def 9e1ed24c53 Fuzzable server 2014-12-06 19:19:39 +01:00
def 366f0281ed Fuzzing options 2014-12-06 16:17:04 +01:00
def 8275f2d811 Finally working... 2014-12-06 14:34:30 +01:00
def 6b1666d51d Next try 2014-12-06 14:18:59 +01:00
def b334c462c2 Try to explicitly close fifo console 2014-12-06 14:14:46 +01:00
def 2e7e4cfd46 Code piece to convert race stoppers to ddrace stoppers 2014-12-06 00:56:08 +01:00
def 14382356d9 Add AntiPing weapons button 2014-12-05 18:47:27 +01:00
def af3b68b253 Enable antiping projectiles starting with 6.4 2014-12-05 17:46:32 +01:00
def e47c653437 Version 6.4 2014-12-05 17:03:54 +01:00
BeaR 5d364410de Add editor compatibility with sound layers from older maps 2014-12-05 14:38:16 +01:00
def 83987e0bfb Fix compile 2014-12-02 21:23:54 +01:00
def 801d6033a5 Revert "More unsigned ints because of undefined integer overflow behaviour"
This reverts commit 623223354a.
2014-12-02 15:54:59 +01:00
def 9ea846033b Optimization for faster server side demo recording 2014-12-02 15:44:54 +01:00
def 0947de4b3f Centisecs -> Decisecs 2014-12-02 13:55:19 +01:00
def 6b12cc6f73 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-02 13:36:36 +01:00
def 0963b68dea Fix memory leak in client 2014-12-02 13:36:27 +01:00
def d0c85acc0d Add cl_show_centisecs 2014-12-02 13:19:06 +01:00
def d3837038eb Fix stack underflow 2014-12-02 12:35:52 +01:00
def db4d472443 Don't copy string when it's in the right position already 2014-12-02 12:35:28 +01:00
def 623223354a More unsigned ints because of undefined integer overflow behaviour 2014-12-02 12:10:21 +01:00
Dennis Felsing b525de33b5 Merge pull request #112 from trml/prediction_weapons
Prediction weapons
2014-12-02 11:24:52 +01:00
nuborn 13f56be3a1 fix recording of projectiles in server too 2014-12-02 02:32:07 +01:00
nuborn 88a1565d75 make the prediction compatible with very large maps 2014-12-02 01:08:52 +01:00
def b4cef79b82 Fix compile with -O3 & -Ofast 2014-12-01 21:10:10 +01:00
def 158ba846fa Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-01 20:35:52 +01:00
def 49f6f2dff2 Fix some editor popup 2014-12-01 20:35:30 +01:00
nuborn bb9c699f35 use consistent values for prediction 2014-12-01 18:34:16 +01:00
nuborn 9752334e75 convert projectiles back to default format before recording demos 2014-12-01 01:32:51 +01:00
nuborn 03bc769c09 prediction of hammer (hits) and grenade (explosions) 2014-12-01 01:31:58 +01:00
Dennis Felsing 598c6c9968 Merge pull request #111 from cinaera/pr_pan
Add option to enable/disable panning per voice
2014-11-30 13:26:01 +01:00
BeaR 186de4e08e Add option to enable/disable panning per voice 2014-11-30 12:23:05 +01:00
BeaR 5f4067c483 Check array boundary for shape type 2014-11-30 11:33:44 +01:00
Dennis Felsing 82eba3875d Merge pull request #109 from cinaera/pr_shape
Shaped audio source support
2014-11-29 21:28:29 +01:00
BeaR 98d42adf9d Implement sound logic for shaped sounds, fix rectangle height property in editor and submit voice shape information to audio interface 2014-11-29 14:29:40 +01:00
BeaR 485aa4ce54 Add editor properties for rectangle shaped sources and visualize falloff distance 2014-11-29 13:20:04 +01:00
BeaR fbcd560eb0 Working on adding editor UI support for sound shapes 2014-11-28 20:25:43 +01:00
BeaR a045a20fba Render sound shapes 2014-11-28 20:01:25 +01:00
BeaR 9996751161 Remove deprecated falloff distance 2014-11-28 19:21:59 +01:00
def 1d4ac3b03a check in better order 2014-11-27 22:38:25 +01:00
BeaR d1327742e7 Start adding support for custom shaped audio fields
Add version check for sound layers
2014-11-27 16:18:15 +01:00
BeaR 80c06aef91 Fix sound cutoff for looped sounds and make sound offset threshold dependent on the size of the audio buffer 2014-11-27 13:56:01 +01:00
def f3ba2e86ca Send timeout code later (fixes timeout code entering issues, fixes timeout protection not working realiably with dummy) 2014-11-27 01:59:55 +01:00
def e4c4ba2d44 Remove another bad log 2014-11-26 21:33:57 +01:00
def d2573e78c2 comment 2014-11-26 21:18:11 +01:00
def 8fdd6da926 Keep retrying for FifoFile even if it's temporarily unavailable 2014-11-26 21:17:00 +01:00
def 9d3cb79db5 Remove log that happens too often 2014-11-26 21:10:22 +01:00
def 771eb1a625 Disregard whitespaces in confusable name comparison 2014-11-26 02:05:40 +01:00
def c1fd694c14 Version 6.3 2014-11-25 23:24:47 +01:00
def 21472046df Remove magic number: 256 -> NUM_TUNINGZONES 2014-11-25 22:47:25 +01:00
def bba82712e0 Add sv_solo_server for easier solo servers (also working for tunezones finally) 2014-11-25 22:42:05 +01:00
def c9b4687cce More time for double click recognition (0.33 instead of 0.25 seconds) (fixes #17) 2014-11-25 21:30:16 +01:00
def 0071fbaf8d Make detail flag work for sounds (fixes #103) 2014-11-25 21:01:31 +01:00
def 91bc16c037 Add an option to assume demos to be race demos 2014-11-25 20:46:21 +01:00
def 93d0f43a6a Broadcast about DDNet client delayed a bit (fixes #72) 2014-11-25 20:33:21 +01:00
def 2acdf5ea17 Code cleanup 2014-11-25 20:29:31 +01:00
def a840df5635 Don't add duplicate skins (fixes #102) 2014-11-25 20:13:40 +01:00
def 4b3dd81a74 Disable map sounds with snd_enable 0 as well (fixes #98) 2014-11-25 19:56:31 +01:00
heinrich5991 1651c2ea35 Only use WriteConsoleW if the intended output is the console
Conflicts:
	src/base/system.c
2014-11-25 19:49:31 +01:00
heinrich5991 d2d4423655 Fix compilation on windows
const int wasn't detected as compile-time constant.
2014-11-25 19:49:19 +01:00
heinrich5991 92cdb15679 Add unicode support for console output on windows
Hints regarding the unicode support were taken from the libuv project, which
really helped.

Conflicts:
	src/base/system.c
2014-11-25 19:48:53 +01:00
def 7e89917ddd Rename ping -> twping 2014-11-24 23:22:37 +01:00
def bde77f09c1 Default port for ping tool 2014-11-24 22:37:13 +01:00
def e8cf3fbec0 Newlines in ping tool 2014-11-24 22:32:24 +01:00
def 18315e8c79 Improve ping on empty server (serverbrowser) 2014-11-24 22:31:13 +01:00
def 8fb0358452 ping tool cleanup 2014-11-24 21:21:16 +01:00
def 7ff73a2ee5 Add ping tool 2014-11-24 21:16:03 +01:00
def d7e5a7b9ab Whitespace cleanup 2014-11-24 19:10:19 +01:00
def bfcc82ff03 Fix demo saving 2014-11-24 18:29:38 +01:00
def 434b757733 Exactly wrong way around 2014-11-24 17:15:05 +01:00
def 92e4a5c7f1 Add ASCII confusable detection in names 2014-11-24 17:09:01 +01:00
def a08ed87cc4 Initial work on confusable utf8 name detection 2014-11-24 16:22:00 +01:00
def 4d4d8ad5e8 Fix compile warnings 2014-11-23 21:24:20 +01:00
def 197ed5dca3 Use 0.6.3 server crash fix since the other seems not to work with GCC 4.9.2 with optimizations on 2014-11-22 13:17:55 +01:00
def 8c07ae19a1 Allow for more than 9 DDNet locations 2014-11-21 14:11:04 +01:00
def 5f035cf9fb Fix infrequent segfault when server shuts down immediately 2014-11-20 22:26:13 +01:00
def 913d5ac226 Fix editor in Images & Sounds views when GUI is deactivated (Reported by Welf) 2014-11-19 21:58:25 +01:00
def 140173311e Uncached time_get by default 2014-11-18 18:21:30 +01:00
def 3df4c76e57 Version 6.2.1 2014-11-16 21:51:45 +01:00
def 8abe166484 Don't render evil cp-tele-in numbers either 2014-11-16 21:51:44 +01:00
def e21bbeaedb Version 6.2 2014-11-16 21:51:44 +01:00
def 2976f0719d Don't render useless TILE_TELECHECKIN number 2014-11-16 21:51:44 +01:00
def 893fe8785b Bring back gfx_text_overlay to stop rendering text at far distances for
better performance
2014-11-16 21:51:44 +01:00
def c79a7eba7a And the same another time (Thanks coffee) 2014-11-16 21:51:44 +01:00
def 56fbd92be9 number check 2014-11-16 21:51:36 +01:00
def eba1fb5b8b Fix wait time on windows (Thanks to Tobii) 2014-11-15 18:14:24 +01:00
def 36a9c00aed Make sound more exact 2014-11-15 00:13:20 +01:00
def 808f889c00 Improve server wakeup timing 2014-11-11 13:00:02 +01:00
def 0a9b0b11b9 Significantly improve performance of /rank 2014-11-11 11:51:36 +01:00
def ae78518c83 Another fix for mariadb 10 2014-11-11 11:35:43 +01:00
BeaR 29b5b92827 Fix C89-compatibility compiler error 2014-11-10 14:09:42 +01:00
def 4e9b6ea336 Ugly fix for client (TODO: improve) 2014-11-10 00:17:31 +01:00
def aede6df2ca Cache get_time calls 2014-11-10 00:08:50 +01:00
def 5923bb10f5 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-11-09 20:23:14 +01:00
def 37a8e89f73 Fix /points and /top5points with MariaDB 10 2014-11-09 20:22:31 +01:00
Dennis Felsing 15d444199b Merge pull request #104 from cinaera/pr_replace
Fix editor sound replacing
2014-11-09 15:11:54 +01:00
BeaR c3689658b4 Fix editor sound replacing 2014-11-09 14:58:28 +01:00
def 630e8430aa Fix: Show 0 finishes in /mapinfo 2014-11-09 00:25:53 +01:00
def bc9d632103 Clean up whitespace detection a bit and add BRAILLE PATTERN BLANK (U+2800) 2014-11-08 20:14:12 +01:00
def 9fb02ade4f Remove BB skins 2014-11-07 02:20:36 +01:00
def c9ceef7523 Add workaround for FlashWindowEx on mingw with old winapi32 2014-11-05 01:46:40 +01:00
def 449a609339 Stupid temporary fix for projectile issue 2014-11-02 14:00:03 +01:00
def e67acc7d5c Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-11-02 11:01:34 +01:00
def f7f4ea9eb9 Version 6.1.2 2014-11-02 11:01:23 +01:00
def 627d6386ee Revert "Revert "Revert "Add antiping for weapons (by nuborn)"""
This reverts commit 8f7e24b4db.
2014-11-02 10:59:22 +01:00
def e096cb56a0 Revert "Revert "Revert "Add option for weapons prediction"""
This reverts commit 99c928fc17.
2014-11-02 10:59:18 +01:00
def 0802177658 Revert "fix bug in weapons antiping (getting lasered in freeze)"
This reverts commit ff8791681f.
2014-11-02 10:59:03 +01:00
def 36375b67e2 Revert "update the version number required for extra antiping features"
This reverts commit 80dbdc3d5b.
2014-11-02 10:58:58 +01:00
def fb0ca67adb Revert "Fix version for antiping projectile"
This reverts commit e651124d59.
2014-11-02 10:58:34 +01:00
def d3797289c1 Revert "improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client"
This reverts commit 56036dcd7b.
2014-11-02 10:58:21 +01:00
def 997e1edc0d Revert "also predict explosions from crazy shotgun"
This reverts commit 1d21a552e8.
2014-11-02 10:58:15 +01:00
BeaR 475c637996 Play sounds and envelopes also on pause 2014-10-31 16:10:09 +01:00
def 11583ed434 Allow 256 voices 2014-10-30 00:14:16 +01:00
def 515ad45eed Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-29 23:19:52 +01:00
def 1e3a474687 Version 6.1.1 2014-10-29 22:49:00 +01:00
BeaR f5fa00cfb7 Prevent integer overflow (fixes segfault in the soundengine) 2014-10-29 22:45:48 +01:00
def 0da475ea65 Fixes #91 2014-10-29 19:53:51 +01:00
def e97fa68627 Antiping for Weapons should work with 6.0 as well 2014-10-29 10:50:04 +01:00
def 4c06232d99 Oops, forgot the version number 2014-10-29 10:49:37 +01:00
def c15fc5bc19 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-29 10:05:44 +01:00
def a635015eca Version 6.1 2014-10-29 10:05:36 +01:00
Dennis Felsing 346d7a04f3 Merge pull request #90 from trml/improve_antipingweapons
Small improvements to antiping for weapons
2014-10-29 00:34:45 +01:00
def 0b1118938d Don't try to load preview images of directories 2014-10-28 22:54:24 +01:00
def ec55a87972 Fix opus map sound crash 2014-10-28 22:42:31 +01:00
def 2a44f0cc0f Merge branch 'Sound' into DDRace64
Conflicts:
	bam.lua
	other/opus/include/ogg/ogg.h
	other/opus/include/opus/opus.h
	other/opus/include/opus/opus_custom.h
	other/opus/include/opus/opus_defines.h
	other/opus/include/opus/opus_multistream.h
	other/opus/include/opus/opus_types.h
	other/opus/include/opusfile.h
	src/engine/client/sound.cpp
2014-10-28 22:08:59 +01:00
def 929d59454c Text change 2014-10-28 21:37:46 +01:00
nuborn 1d21a552e8 also predict explosions from crazy shotgun 2014-10-28 21:30:51 +01:00
nuborn 56036dcd7b improve antiping for weapons (particularly in vanilla) by taking into account more of the info already available to the client 2014-10-28 21:13:55 +01:00
def e651124d59 Fix version for antiping projectile 2014-10-28 20:07:51 +01:00
Dennis Felsing 8334f1641a Merge pull request #89 from trml/fix_antipingweapons
Add updated/fixed weapons prediction
2014-10-28 20:07:47 +01:00
Dennis Felsing d12c485e4a Merge pull request #84 from east/voteopslow
Balance sending of vote options
2014-10-28 20:07:19 +01:00
nuborn 80dbdc3d5b update the version number required for extra antiping features 2014-10-28 18:30:15 +01:00
nuborn ff8791681f fix bug in weapons antiping (getting lasered in freeze) 2014-10-28 17:23:48 +01:00
def 30801c4e15 Add bind for dyncam to settings 2014-10-28 16:42:26 +01:00
nuborn 99c928fc17 Revert "Revert "Add option for weapons prediction""
This reverts commit 451cc8949d.
2014-10-28 15:51:36 +01:00
nuborn 8f7e24b4db Revert "Revert "Add antiping for weapons (by nuborn)""
This reverts commit 755e9f4d1c.
2014-10-28 15:50:28 +01:00
BeaR 5562fac602 Add opus as external library (windows only) 2014-10-28 14:38:50 +01:00
BeaR 49373ee412 Fix opus sound loading 2014-10-28 14:01:21 +01:00
def e283e10685 A bit better, but still buggy 2014-10-28 12:22:49 +01:00
def 9b3ca0d8a1 Something that sounds a bit more like music (NumFrames wrong or op_read wrong?) 2014-10-28 10:27:00 +01:00
def a8d257a7de Fix loop boundaries in save and load operations 2014-10-28 10:07:21 +01:00
def 7d7b78938e Fix opus compilation 2014-10-28 09:51:15 +01:00
def f1cca50695 Fix Mac OSX compilation 2014-10-28 02:25:45 +01:00
def 3730e19b5c Fix Android compilation 2014-10-28 02:01:51 +01:00
def 24bd595fad Version 6.0.3 2014-10-28 01:56:08 +01:00
def 24881449b3 Revert "Add OGG"
This reverts commit 28d276cd7e.
2014-10-28 01:34:15 +01:00
def 3b1d23f42c Revert "Add Opus"
This reverts commit a7dafa40c7.
2014-10-28 01:34:09 +01:00
def ca52f841b0 Revert "Add opusfile"
This reverts commit 827699263c.
2014-10-28 01:34:03 +01:00
def 0b1de66bdf Revert "Some work on Opus map sounds (not working yet)"
This reverts commit 26260181bd.
2014-10-28 01:33:58 +01:00
def f4231100a7 Make triangle quad rendering optional, as it seems to cause performance problems 2014-10-28 01:12:11 +01:00
def eaaa29f5f6 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-27 20:03:50 +01:00
def 755e9f4d1c Revert "Add antiping for weapons (by nuborn)"
This reverts commit 48e66a2ab3.

Conflicts:
	src/game/client/gameclient.cpp
	src/game/version.h
2014-10-27 20:03:22 +01:00
def 451cc8949d Revert "Add option for weapons prediction"
This reverts commit 5d0bf727b0.
2014-10-27 19:54:18 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
east 40e7de63e9 config var renamed 2014-10-27 13:39:33 +01:00
east a6d70e83f6 support for remove_vote added 2014-10-27 13:34:29 +01:00
def 827699263c Add opusfile 2014-10-27 09:25:24 +01:00
def a7dafa40c7 Add Opus 2014-10-27 09:22:52 +01:00
def 28d276cd7e Add OGG 2014-10-27 09:05:49 +01:00
def 5fd50e0b46 Fix warning at client start 2014-10-27 09:05:22 +01:00
east 630fd4fa07 sending vote options balanced 2014-10-26 19:39:42 +01:00
def 0ac9002a80 Fix solo zone + laser dragg in spec (fixes #59) 2014-10-26 02:14:12 +01:00
def 71eb763e53 Fix: Don't autoswitch weapons on (dd)race(network) servers (fixes #57) 2014-10-26 02:01:03 +01:00
def 9453b80e66 Forgotten 2014-10-26 02:57:03 +02:00
def 0f257bf553 Add delay (of 1 minute by default) to loading savegames 2014-10-26 02:39:12 +02:00
def 59fccf18f0 Add window highlight on Linux (fixes #65) 2014-10-26 02:25:36 +02:00
def 35f8b7a6dd Add option for disabling gun sounds 2014-10-26 01:00:30 +02:00
def 4ed3ce8070 Revert "No fucking gunfire sound when using jetpack"
This reverts commit 4a11befaf4.
2014-10-26 00:50:10 +02:00
def b752264785 Version 6.0.2 2014-10-25 03:05:58 +02:00
def 4a11befaf4 No fucking gunfire sound when using jetpack 2014-10-25 03:01:55 +02:00
def 34c39b43f0 Cleanup 2014-10-25 02:53:26 +02:00
def 8d230306d8 Fix sound enabling and disabling (fixes #82) 2014-10-25 02:52:08 +02:00
def 699fb60532 Fix: Mapping sounds in editor works even when the sound system is disabled 2014-10-25 01:23:39 +02:00
def 1523954333 check that index in within array bounds + only predict grenade projectiles (by nuborn) 2014-10-25 01:08:14 +02:00
def 3d9b232157 Minor Sound cleanup 2014-10-25 01:07:24 +02:00
def 22064f2eb3 Update credits 2014-10-24 23:33:08 +02:00
def fd49ebd03a Version 6.0.1 2014-10-24 23:04:31 +02:00
def 12102a14a6 Fix sound and image loading 2014-10-24 23:03:16 +02:00
def 61b704dac3 Cleanup 2014-10-24 22:15:55 +02:00
def 73567c898e Cleanup 2014-10-24 22:13:46 +02:00
def 4403a2df62 Minor cleanup 2014-10-23 17:40:10 +02:00
def 033ca57331 Oops 2014-10-23 17:39:29 +02:00
def 5d0bf727b0 Add option for weapons prediction 2014-10-23 17:34:24 +02:00
def 48e66a2ab3 Add antiping for weapons (by nuborn) 2014-10-23 17:31:29 +02:00
def a0bfc5a083 Add shift + right click to delete a quad (Suggestion by Welf) 2014-10-23 15:55:50 +02:00
def f8f8f0613e Rename "Ambient" to "Map Sound" 2014-10-23 15:53:23 +02:00
BeaR 1e42136f5d Fix wrong memory allocation and sound selection 2014-10-23 12:19:26 +02:00
BeaR 78aa7c51be Prevent modulo 0 2014-10-23 12:04:46 +02:00
def 99c07d884d Another try at the fix 2014-10-21 14:57:58 +02:00
def e29571dd73 save doesn't create ranks accidentally anymore (fixes #73) 2014-10-21 14:27:10 +02:00
def 6bcf2bbe0d Revert "Teammate switching team reported on chat"
This reverts commit b19688fa35.
2014-10-21 14:22:53 +02:00
def 7b259b3022 Revert "Update teams.cpp"
This reverts commit fa59910ef2.
2014-10-21 14:22:47 +02:00
Dennis Felsing 9baf62a3f0 Merge pull request #60 from Wohoo-GC/DDRace64
Teammate switching team reported on chat
2014-10-21 12:18:19 +02:00
Dennis Felsing 792a891dfa Merge pull request #71 from cinaera/pr_speaker
Add editor icon for audio source
2014-10-21 12:15:18 +02:00
BeaR 09f8630b68 Add editor icon for audio source 2014-10-21 12:07:09 +02:00
timgame 62ca346122 Merge branch 'DDRace64' of https://github.com/def-/ddnet into DDRace64 2014-10-21 00:06:57 +02:00
timgame beb125da36 remove basetile 2014-10-20 23:55:55 +02:00
Wohoo-GC 98305dab0e Mouse button 2 to decrease FSAA samples in menu 2014-10-19 18:01:03 +02:00
def d213a30bed Change new to mem_alloc (thanks BeaR) 2014-10-19 14:09:23 +02:00
def 0b2bf15c35 Clean up compiler warnings 2014-10-19 13:19:36 +02:00
def f609417d43 Don't clear rcon history when connecting to new server 2014-10-19 13:11:57 +02:00
BeaR 2b1272ed69 Work on nicer audio timing 2014-10-18 18:41:59 +02:00
BeaR b67fab8fdb Fix parallax scrolling for audio sources and remove global property 2014-10-18 18:41:58 +02:00
BeaR ef3b801999 Add volume slider for map sounds 2014-10-18 18:41:57 +02:00
BeaR 0931e6ed28 Fix sound envelopes ingame 2014-10-18 18:41:55 +02:00
BeaR e211c7a2b2 Ingame sound pos envelope support 2014-10-18 18:41:55 +02:00
BeaR 920ac531aa Add support for position envelopes to sound sources 2014-10-18 18:41:55 +02:00
BeaR 0a70d49566 Remove distance from envelopes, add falloff distance to source properties and render it in the editor 2014-10-18 18:41:55 +02:00
BeaR 8addf25b24 Add support to modulate voice volume and falloff distance 2014-10-18 18:41:54 +02:00
BeaR 774be5561e Fix crash when loading sound files threaded (double io_close) 2014-10-18 18:41:54 +02:00
BeaR 655c2466b9 Start adding a sound envelope 2014-10-18 18:41:54 +02:00
BeaR dfea1e9e71 Remove debug rendering for sound layers and unused item members 2014-10-18 18:41:53 +02:00
BeaR b5d0034674 Add embedded sound support 2014-10-18 18:41:53 +02:00
BeaR 96a6d6d85b Take sample duration into account when enqueuing sound sources 2014-10-18 18:41:53 +02:00
BeaR 66d02de673 Fix saving of sounds 2014-10-18 18:41:52 +02:00
BeaR 16084d93cf Working on correctly replay sounds 2014-10-18 18:41:52 +02:00
BeaR 2e30e96ba5 Improve sound replay 2014-10-18 18:41:52 +02:00
BeaR dd35d2be84 Add editor support for editing sound source properties 2014-10-18 18:41:52 +02:00
BeaR 39f93716e0 Support replaying mapsounds 2014-10-18 18:41:52 +02:00
BeaR 2e36bd9906 Add missing file 2014-10-18 18:41:51 +02:00
BeaR 5df94f772f Add support for sound sources 2014-10-18 18:41:51 +02:00
BeaR 2bd9df2626 Adding support for saving/loading sound layers 2014-10-18 18:41:51 +02:00
BeaR d968b42f2f Add support for sound layers 2014-10-18 18:41:51 +02:00
BeaR 30989566bb Correctly load sound in the editor on add 2014-10-18 18:41:50 +02:00
BeaR 90975fbe9e Start adding UI for loading sounds in the editor 2014-10-18 18:41:50 +02:00
BeaR 2f837a4c44 Notify player on chat highlight (windows only) 2014-10-18 16:17:36 +02:00
def 084b59d9b6 Show sleepy eyes when a player is paused 2014-10-16 23:22:53 +02:00
def 082ecfe691 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-10-16 17:42:38 +02:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +02:00
BeaR 944218ca9f Render quads as triangle fans 2014-10-15 15:44:29 +02:00
def 5cb861c331 Disable old client display for now since it's not working with dummy 2014-10-12 18:49:46 +02:00
def 607a27718e Revert "Removed InputData Array"
This reverts commit 83f6fc70fa.
2014-10-12 17:52:53 +02:00
Tomew 83f6fc70fa Removed InputData Array 2014-10-12 17:19:09 +02:00
def 3ff6b951c1 Configurable messages 2014-10-12 12:51:54 +02:00
def 517f1a80ea Add notification for old client 2014-10-12 12:49:44 +02:00
def fda12b88bf Make sv_client_suggestion optional 2014-10-12 11:35:36 +02:00
def 6333583141 Display message about DDNet client to players not using it 2014-10-12 11:33:36 +02:00
def 1d7d511941 Set ed_zoom_target to 0 on default 2014-10-12 02:06:44 +02:00
def f81d2af6d3 text messag 2014-10-11 22:47:30 +02:00
def 1fc38356a5 Fix cl_show_ids 2014-10-11 22:47:13 +02:00
def e0a16e0644 /mapinfo: Show mapper name 2014-10-11 12:58:27 +02:00
def 1ea495c7e2 Update credits 2014-10-11 01:21:08 +02:00
def 80fc4e24d3 Version 5.3 2014-10-11 01:13:51 +02:00
def 2fa361fe4d Fix previous commits 2014-10-11 01:10:53 +02:00
def 9c0bb7d02b Vote random map with defined nr of stars 2014-10-11 01:01:32 +02:00
def dcc64f1902 Vote random unfinished map with defined nr of stars 2014-10-11 00:41:56 +02:00
def 3dd24c3dee Add stars to /mapinfo 2014-10-11 00:16:33 +02:00
Wohoo-GC fa59910ef2 Update teams.cpp 2014-10-09 13:05:59 +02:00
Wohoo-GC b19688fa35 Teammate switching team reported on chat
Teammate switching team reported on chat and console.
Solved also:
Function OnCharacterDeath() calls itself multiple time. Open team after checking it is not opened, then kill members.
2014-10-09 12:46:20 +02:00
def c5b796a8f1 ed_zoom_target 1 by default 2014-10-08 15:07:02 +02:00
BeaR 1f4430f3d0 Editor: Add feature to zoom to mouse position 2014-10-07 20:07:46 +02:00
BeaR ebf1d4b273 Fix possible bug as CGameTeams is not thread-safe 2014-10-07 15:20:38 +02:00
Dennis Felsing 67f6fb0ff2 Merge pull request #53 from cinaera/pr_wrap
Editor: Scale quad point selection indicator with zoomlevel
2014-10-07 14:54:59 +02:00
BeaR fa83e5b340 Editor: Scale quad point selection indicator with zoomlevel 2014-10-07 14:49:45 +02:00
Wohoo-GC 3a2f078360 SHIFT+TAB invert completion order 2014-10-06 23:37:35 +02:00
Wohoo-GC 200fc3545b SHIFT+TAB invert completion order 2014-10-06 23:36:39 +02:00
Dennis Felsing 3875741604 Merge pull request #51 from savander/DDRace64
Skin name in skin selector (next to the Skin useful)
2014-10-06 21:24:59 +02:00
def 4809fcd325 Sort player completion by name 2014-10-06 13:06:35 +02:00
def 89b2e78bc8 Shift+TAB for player completion (by Wohoo) 2014-10-06 13:02:55 +02:00
savander 66d0e3f57e Skin name in skin selector 2014-10-05 22:26:47 +02:00
def 8c45d885d5 Allow 4 spectator mode changes per second 2014-10-03 21:41:18 +02:00
def 85c953d25b Consistently allow rotations and flipping in editor 2014-10-01 18:55:53 +02:00
def 32fedf3518 Automatically rcon-authenticate dummy on connection if player is authenticated already 2014-10-01 12:41:10 +02:00
def bc916da43c Print client version in status 2014-09-30 13:21:44 +02:00
def 932fb826c7 Add cl_zoom_background_layers (set to 0 to keep background nice when zoomed out) 2014-09-29 21:13:35 +02:00
def 90518f951d Fix saving in solo teams 2014-09-29 19:32:43 +02:00
def 1c954c168f Proper team count, should fix savegames 2014-09-29 17:36:14 +02:00
def e42b7e8bd2 Version 5.1 2014-09-29 13:16:14 +02:00
def 6cecffe67c Fix editor input on Android 2014-09-29 13:13:56 +02:00
def a670348b88 Wording 2014-09-27 19:10:15 +02:00
def 31b049533c 3 more keys to be disabled on text input 2014-09-27 11:06:55 +02:00
def 01f2b6ea02 Fix buggy envelope editor while tile picker is active 2014-09-27 11:04:09 +02:00
Dennis Felsing 912c4fae5c Merge pull request #49 from timgame/DDRace64
automapper supports rotation (and changed "CheckEmptyTiles" to "NoDefaultRule")
2014-09-27 11:02:42 +02:00
def b94981019b Disable key inputs in editor when typing in a field 2014-09-27 11:01:58 +02:00
timgame 20aaa37cb9 automapper supports rotation 2014-09-27 10:11:28 +02:00
def ce0f1d2ed7 Fix segfaults when mysql server is not reachable and map is changed/reloaded 2014-09-26 23:59:11 +02:00
def 896a6fda9b Lock works for single player teams 2014-09-26 23:47:25 +02:00
def f589463697 Log player out of rcon after timeout protection was used 2014-09-26 23:14:28 +02:00
def 0a131df621 Fix broken start line 2014-09-26 13:03:01 +02:00
def 03109ef232 Prevent crash 2014-09-26 12:43:56 +02:00
def 2c2b77ac3b Check whether team has finished once a player in the team kills 2014-09-26 03:42:49 +02:00
def 3804c16f02 Fix a bunch of crashes on server demo recording 2014-09-26 03:20:47 +02:00
def c54cf2e7ba Cleanup 2014-09-26 02:41:25 +02:00
def c78cea9046 Add sv_demo_chat (0 by default to disable recording chat) 2014-09-26 02:40:58 +02:00
def 416ae46730 Reset recording on player death 2014-09-26 02:25:53 +02:00
def b4f77c4b71 Add sv_player_demo_record (mostly from Teerace) 2014-09-26 02:05:31 +02:00
def 1bee3af878 Print broadcasts by default 2014-09-23 19:34:43 +02:00
def a32e9272eb Restore Law & Order 2014-09-23 19:06:25 +02:00
Dennis Felsing 8abc15f48d Merge pull request #47 from Laxa/upstream
Add cl_output_broadcast + add button for it + fix multi-line display.
2014-09-23 18:55:13 +02:00
laxa a40bacc542 Remove useless <string.h> 2014-09-23 18:36:14 +02:00
laxa 41aa9300de Added button for ClOutputBroadcast + fix the multi-line display 2014-09-23 18:34:48 +02:00
def d38bf7f83a typo 2014-09-23 17:33:33 +02:00
laxa 36153fc7fd Add conf variable for broadcast ouput; made broadcast output works with multiple lines 2014-09-23 10:37:44 +02:00
def 89b92b4d6b Cleanup 2014-09-23 09:52:18 +02:00
laxa 080ffc4df4 Sort ingame menus -> kick player -> move players to spectator 2014-09-23 08:03:26 +02:00
laxa f13f040468 Sort playerlist inside game from Player tab 2014-09-23 02:10:59 +02:00
def 2c610053c1 Fix: Selecting quads works after having rotated one 2014-09-22 22:25:05 +02:00
def 2aedf8e64a Grammar 2014-09-22 18:57:56 +02:00
def fbd87e7370 Fix potential server crashes 2014-09-22 18:56:59 +02:00
savander 1278538a84 Fix encoding 2014-09-22 16:16:47 +02:00
savander 0ecbf36de4 Kill Protection: prevent joining to spectators 2014-09-22 16:12:01 +02:00
def a5406762f6 Fix menu 2014-09-21 15:08:25 +02:00
Dennis Felsing 028d6b98f4 Merge pull request #43 from Laxa/upstream
Added cl_reset_wanted_weapon_on_death
2014-09-21 15:05:52 +02:00
laxa f5ef04a3f7 Change the placement tab of cl_reset_wanted_weapon_on_death 2014-09-21 15:03:42 +02:00
laxa 9f5556a2e4 Add buton for cl_reset_wanted_weapon_on_death 2014-09-21 14:38:34 +02:00
laxa 718e45d84d Added cl_reset_wanted_weapon_on_death 2014-09-21 14:11:27 +02:00
def 04f38d85f5 Remove debug message 2014-09-21 02:12:46 +02:00
def 66c2a50209 Version 5.0.2 2014-09-20 21:45:19 +02:00
def bde8c33c20 Hopefully real fix now 2014-09-20 21:44:43 +02:00
def 57778b1f4c Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-09-20 21:14:48 +02:00
def 67de8be7b0 Version 5.0.1 2014-09-20 21:14:34 +02:00
def 572b4f91bd Fix serverbrowser for more than 24 players again 2014-09-20 21:14:19 +02:00
timgame 8dc728de96 added option to automap tiles with index 0 2014-09-20 20:57:29 +02:00
def 3a325ccc08 Version 5.0 2014-09-20 16:33:19 +02:00
def 3c833bd93e Make the initial ping in serverbrowser less wrong (still not perfect) 2014-09-20 16:20:27 +02:00
def 4ea77f1080 Oops 2014-09-20 16:11:29 +02:00
def 060b794a9d Suggest Novice servers to new players 2014-09-20 16:08:11 +02:00
def 36b33d6138 Fix: Prevent animated server names and fake 0 pings in serverbrowser 2014-09-20 15:48:30 +02:00
def 7035bf87fd Refresh DDNet tab when a new serverlist was received 2014-09-20 15:35:01 +02:00
def 68db4a0709 Update credits 2014-09-20 15:26:55 +02:00
def 90c6833707 Fix versionsrv compile on Windows (hopefully) 2014-09-20 15:25:31 +02:00
def d2ef256f06 Final compilation fix for Windows 2014-09-20 14:42:12 +02:00
def 4a703576ab Revert "Now Windows compiling (by Tobii)"
This reverts commit 5b4878d0d4.
2014-09-20 14:41:38 +02:00
def 5b4878d0d4 Now Windows compiling (by Tobii) 2014-09-20 14:30:18 +02:00
def 3b3955632c Hopefully fix Windows compile 2014-09-20 14:20:43 +02:00
def f175025c8c Add number of finishes to /mapinfo 2014-09-20 14:07:46 +02:00
def 7a2021806b Fix ingame ddnet menu (thanks east) 2014-09-20 13:49:29 +02:00
def d6aea5ba40 Prepare DDNet gametype name 2014-09-20 13:48:59 +02:00
def 684ad0b890 Ingame DDNet menu 2014-09-20 13:41:20 +02:00
def 520b84328f Fix 5:4 resolution in menu 2014-09-20 13:37:00 +02:00
east c4fc429e99 small cleanup 2014-09-20 11:47:51 +02:00
east 603727232a ddnet server list zlib compression added 2014-09-20 11:36:46 +02:00
east 66a3d89bf6 Merge remote-tracking branch 'def/DDRace64' into ddsrvs 2014-09-20 00:38:09 +02:00
east cda02a3d9a versionsrv serverlist download added 2014-09-20 00:36:22 +02:00
east 202d5d8866 Filter flag grid added 2014-09-19 23:52:09 +02:00
Tobias Urlaub b6c93baf72 Fix: also record a demo when the start line is on the front layer 2014-09-19 20:56:15 +02:00
east 9db12d455d working on CDDNetCountry 2014-09-18 16:13:06 +02:00
east 6ab9279211 json related updates 2014-09-18 16:11:22 +02:00
east d161005658 json parser added 2014-09-18 14:40:29 +02:00
east c2b7482546 Merge remote-tracking branch 'def/DDRace64' into ddsrvs 2014-09-18 14:14:25 +02:00
Dennis Felsing 5f2103c42a Merge pull request #38 from timgame/DDRace64
automapper works without basetile
2014-09-18 12:43:49 +02:00
def 741cf8f8c7 Cleanup & Halloween event 2014-09-18 12:14:00 +02:00
def 18d1e25d5c Fix: Render SwitchTimedOpen and Unsolo on seprate tiles 2014-09-17 20:22:42 +02:00
def f3707c26f8 Fix: Show tune layer when cl_overlay_entities is less than 100 2014-09-17 19:56:42 +02:00
Tobias Urlaub 45823466ec Fix: Rcon spoofing protection bans clients after password change 2014-09-16 21:14:31 +02:00
timgame 442f88bd2b automapper works without basetile 2014-09-15 14:45:37 +02:00
def 6badc5a715 Version 4.9.3 2014-09-14 21:08:00 +02:00
def bbc21005dc Use space AND colon 2014-09-13 23:50:35 +02:00
def f8fa71de63 Use space as delimiter for ID 2014-09-13 21:48:55 +02:00
east e732008157 DDNet serverlist added 2014-09-13 16:36:25 +02:00
def 886044532b Only disable user inputs in race mods 2014-09-13 12:31:39 +02:00
def 6ab4c566e9 Add a small close button in editor for people who happen to accidentally click on the Editor symbol in menu, but are unable to find File -> Exit 2014-09-12 23:07:47 +02:00
def ca99f3f518 Change 2 more messages 2014-09-12 20:29:02 +02:00
def a36358190b Mac OS X compilation 2014-09-11 21:38:23 +02:00
def efeb2b9417 Minor fix 2014-09-11 21:38:13 +02:00
def 1c8ca264c7 Use semaphores instead of locks 2014-09-11 21:12:18 +02:00
def dcfe0a7295 Fix Visual Studio compile 2014-09-11 18:23:59 +02:00
def 3f8abd10ce Add preparation for broadcast output 2014-09-10 23:20:04 +02:00
def 93e0ecfd16 Version 4.9.2 2014-09-09 23:28:20 +02:00
def 5b72302672 Instead of banning players for reconnecting too often, make them wait 3 seconds (fixes #27) 2014-09-09 23:27:28 +02:00
def 49682f4a8d Threaded logger output 2014-09-09 23:02:05 +02:00
def d44e6088bb console output cleanup 2014-09-09 22:23:56 +02:00
def bb6c3ba951 Ignore user inputs when paused 2014-09-07 01:53:20 +02:00
def 93b57433b4 Fix: Reset zoom when going out of spectate mode (in zcatch for example) 2014-09-07 01:41:02 +02:00
def 2cfb494c84 Fix compilation 2014-09-07 01:03:55 +02:00
def 6d3aece8b0 Version 4.9.1 2014-09-07 00:15:57 +02:00
def 8a4e3d9605 Revert "Only set active weapon when it actually has ammo (Thanks Saavik)"
This reverts commit c88a4f00d2.
2014-09-07 00:15:03 +02:00
def 54497647b4 Minor console output cleanup 2014-09-06 23:22:35 +02:00
def ff4779e214 admin -> moderator in force-vote messages 2014-09-06 21:19:44 +02:00
def 4ab0083f89 Fix: unlock team when it is saved 2014-09-06 21:08:21 +02:00
def 3bf6d63040 Version 4.9 2014-09-06 15:13:30 +02:00
def 07a46ab024 Cleanup in menu 2014-09-06 01:43:20 +02:00
def 0da1ba238c Add cl_cpu_throttle_inactive 2014-09-06 01:42:59 +02:00
def fc9ab26be0 Repopulate demo list after closing demo player because a new demo could have been created (Thanks Saavik) 2014-09-05 21:17:04 +02:00
def c88a4f00d2 Only set active weapon when it actually has ammo (Thanks Saavik) 2014-09-05 21:12:33 +02:00