Commit graph

15900 commits

Author SHA1 Message Date
bors[bot] 4931d00201 Merge #1589
1589: Remove some code duplication in CSaveTee::LoadString r=def- a=def-

by using a switch-case with fallthroughs, seems like the perfect use case.

Co-authored-by: def <dennis@felsin9.de>
2019-04-07 12:01:59 +00:00
bors[bot] 79a6ae6ae9 Merge #1592
1592: Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as … r=def- a=ChillerDragon

…an array. Should fix https://github.com/teeworlds/teeworlds/issues/2073

(cherry picked from commit e086f4b35b)

Co-authored-by: Jordy Ruiz <jordy.ruiz@univ-lille.fr>
2019-04-07 11:28:44 +00:00
Jordy Ruiz 1e0cc51ba1 Add bound check in datafile.cpp anywhere m_ppDataPtrs is accessed as an array. Should fix #2073
(cherry picked from commit e086f4b35b)
2019-04-07 13:10:07 +02:00
bors[bot] ad4c13b115 Merge #1590
1590: Update Brazilian Portuguese translation r=def- a=rffontenelle



Co-authored-by: Rafael Fontenelle <rffontenelle@users.noreply.github.com>
2019-04-06 21:40:59 +00:00
bors[bot] 5d9d0d7d35 Merge #1587
1587: Small fixxings r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2019-04-06 21:08:40 +00:00
ChillerDragon 84409bd554 Ignore idea folder 2019-04-06 22:53:13 +02:00
Rafael Fontenelle 55ae5e2376
Update Brazilian Portuguese translation 2019-04-06 16:54:34 -03:00
def e27679ebcc Remove some code duplication in CSaveTee::LoadString
by using a switch-case with fallthroughs
2019-04-06 20:28:47 +02:00
Dennis Felsing edbd899471
Merge pull request #1588 from Ryozuki/pr_save_telegun
Save telegun on /save
2019-04-06 20:24:37 +02:00
def e539bbacb1 Handle FS failures while updating (fixes #1560)
Not sure if I caught all locations
2019-04-06 19:24:40 +02:00
def 25c54ef4db Implement show_ips to protect accidental leaking of IPs
Marks all sensitive data with <{ }> and then filters that out when
show_ips is not set.
2019-04-06 19:22:02 +02:00
Ryozuki 52b58c3d5b
final fix 2019-04-06 18:38:25 +02:00
Ryozuki 69fd7f1767
fix and add gameuuid 2019-04-06 18:37:25 +02:00
Ryozuki fb398ebcbf
better this way 2019-04-06 18:19:56 +02:00
Ryozuki beeda4d7bb
fix warnings 2019-04-06 18:18:46 +02:00
Ryozuki b92b2f1878
save telegun on /save 2019-04-06 18:13:11 +02:00
bors[bot] b25c5275d5 Merge #1585
1585: Use OpenSSL md5 if it is available r=def- a=heinrich5991

Fixes #1582.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2019-04-06 15:43:24 +00:00
ChillerDragon 905204781b Cleanup if nesting 2019-04-06 17:22:15 +02:00
ChillerDragon ce5a7ea626 Remove one of two graphic includes 2019-04-06 17:07:17 +02:00
ChillerDragon abba71e6d6 Fix tw code style 2019-04-06 17:06:12 +02:00
ChillerDragon 238d5521f6 Ignore vscode folder 2019-04-06 17:04:34 +02:00
bors[bot] ea82402e7e Merge #1574
1574: Updater localization and update language files r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
2019-04-06 14:53:46 +00:00
bors[bot] 2f4dd5ae2c Merge #1572
1572: cl_mouse_min_distance as requested by Makoyuri r=heinrich5991 a=def-

also cl_dyncam_min_distance

Co-authored-by: def <dennis@felsin9.de>
2019-04-06 14:17:25 +00:00
def cc1ce8699b Update language files
Is this the proper way?

for i in data/languages/*.txt; do scripts/languages/copy_fix.py $i $i.tmp --delete-unused --append-missing --delete-empty && mv $i.tmp $i; done
2019-04-06 15:19:07 +02:00
def 9df30dc235 Localize mentions 2019-04-06 15:18:40 +02:00
def 330a99686d Add localization for updating output 2019-04-06 15:18:35 +02:00
Dennis Felsing a0c0ff5d3f
Merge pull request #1584 from 12pm/editor-mentions
Notify about chat mentions in editor
2019-04-06 13:45:58 +02:00
12pm 98bfeb3e72 Notify about chat mentions in editor 2019-04-06 11:32:50 +02:00
heinrich5991 e3657ab2d5 Use SHA256 instead of MD5 in some places
This only works in places where the actual choice of hashing function
doesn't matter.
2019-04-06 02:56:29 +02:00
heinrich5991 e44b1ca986 Use OpenSSL md5 if it is available
Fixes #1582.
2019-04-06 02:56:29 +02:00
Dennis Felsing dfa06696d6
Merge pull request #1578 from Ryozuki/add_clan_color
Add clan color to people with same clan as you (and yourself)
2019-04-05 18:16:19 +02:00
Ryozuki f0a4da58cb
Merge branch 'master' into add_clan_color 2019-04-05 16:46:14 +02:00
bors[bot] 1ee286121d Merge #1579
1579: add color to ping in scoreboard r=def- a=Ryozuki



Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
2019-04-05 13:43:46 +00:00
Ryozuki 4e3b2191a2
fix wrong variable 2019-04-05 13:47:38 +02:00
Ryozuki 06e8a07b99
fix phrasing 2019-04-05 13:36:18 +02:00
Ryozuki 735aab9609
fix braces 2019-04-05 13:25:17 +02:00
Ryozuki bb3cde4369
add color to ping in scoreboard 2019-04-05 13:12:08 +02:00
Ryozuki ef6d4b5de6
add clan color to people with same clan as you 2019-04-05 12:41:01 +02:00
def e31561eb47 cl_mouse_min_distance as requested by Makoyuri
also cl_dyncam_min_distance
2019-04-04 20:19:37 +02:00
Dennis Felsing a7dabe3475
Merge pull request #1570 from 12pm/playerflags
Add playerflags, dnsbl, and ips for non-admins in status
2019-04-04 18:55:40 +02:00
Dennis Felsing fc76c2219f
Merge pull request #1566 from def-/pr-demo-speed
Demo speed improvements
2019-04-03 19:02:42 +02:00
Dennis Felsing 1fd130cf15
Merge pull request #1564 from def-/pr-dummy-fixes
Some more dummy fixes (might fix #1415)
2019-04-03 19:02:28 +02:00
Dennis Felsing b468552c43
Merge pull request #1563 from def-/pr-gun-sound
Enable gun sound by default
2019-04-03 19:02:14 +02:00
Dennis Felsing bebede35d2
Merge pull request #1569 from rffontenelle/patch-2
README: pnglite is in AUR, update instructions
2019-04-03 17:56:47 +02:00
12pm a7ef921e3f Add playerflags, dnsbl, and ips for non-admins in status 2019-04-03 15:07:05 +02:00
Rafael Fontenelle 2fc6005c10
README: pnglite is in AUR, update instructions 2019-04-03 09:13:16 -03:00
bors[bot] d72929d33b Merge #1567
1567: Make world offset calculation more accurate r=def- a=12pm

Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-04-03 06:08:15 +00:00
12pm 4efc0e3b82 Make world offset calculation more accurate
Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor
2019-04-03 01:05:38 +02:00
def 9daa3beacd Broadcast: Fix display time during demo replay
Only show for the same amount of ticks as originally, not number of
seconds, otherwise at high demo speeds you will see the broadcast for a
much longer game play time than originally.
2019-04-02 23:28:13 +02:00
def e25d43aaf6 Extend GUI options for available demo speeds up to 64 2019-04-02 23:20:44 +02:00