ddnet/data
bors[bot] 98bf721587
Merge #4726 #4727 #4728 #4880 #5022
4726: Display super with "super" string in scoreboard (fixes #4724) r=heinrich5991 a=def-

instead of showing the number 64

Alternative to https://github.com/ddnet/ddnet/pull/4725

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


4727: Increase MAX_IDS to 32k (fixes #4723) r=heinrich5991 a=def-

Not sure I like it, otherwise we have to edit Game City.

Maybe we should fail this in map editor already instead of allowing to
create a map which requires > MAX_IDS

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


4728: Implement shields that remove specific weapon (fixes #4572) r=heinrich5991 a=def-

Thanks to Cellegen for graphics.

Functionality works, still a bit buggy sprite display (see screenshot), maybe someone can
quickly spot what I'm doing wrong

<img width="898" alt="Screenshot 2022-02-18 at 00 50 14" src="https://user-images.githubusercontent.com/2335377/154591108-d89cb475-daaf-4a6a-9748-17160a1e71a2.png">

## Checklist

- [x] Tested the change ingame
- [x] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


4880: Add mysql to github workflow in ubuntu 20.04 r=heinrich5991 a=def-

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


5022: Use std::clamp r=heinrich5991 a=def-

Not sure if we want to, there are some easy functions like this we could
take from stdlib now

<!-- What is the motivation for the changes of this pull request -->

## Checklist

- [ ] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Dennis Felsing <dennis@felsin9.de>
Co-authored-by: Jupeyy <jupjopjap@gmail.com>
2022-04-29 00:30:17 +00:00
..
assets Update missing file from dilate 2021-02-13 14:04:42 +01:00
audio Rename rifle to laser 2019-11-22 15:37:18 +01:00
countryflags Merge #4740 2022-02-20 10:11:36 +00:00
demos Implement shields that remove specific weapon (fixes #4572) 2022-04-28 16:49:32 +02:00
editor Implement shields that remove specific weapon (fixes #4572) 2022-04-28 16:49:32 +02:00
fonts Update icons font 2022-03-19 18:35:37 +01:00
languages Remove dots in tooltip texts 2022-04-28 16:46:18 +02:00
mapres Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
maps Add tutorial joining code and tutorial map 2022-03-19 23:35:27 +01:00
maps7 Add tutorial joining code and tutorial map 2022-03-19 23:35:27 +01:00
menuimages Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
shader Add Vulkan backend 2022-03-21 12:39:51 +01:00
skins Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
themes Add New Year season theme by mind and use for 2 days 2020-12-28 17:45:04 +01:00
arrow.png Optimize PNGs 2016-04-27 01:27:57 +02:00
autoexec_server.cfg Add tutorial joining code and tutorial map 2022-03-19 23:35:27 +01:00
blob.png Merge remote-tracking branch 'timakro/new_hookthrough' 2016-04-27 18:59:51 +02:00
censorlist.txt Implement censoring words on server 2020-09-18 19:18:08 +02:00
console.png Optimize PNGs 2016-04-27 01:27:57 +02:00
console_bar.png Optimize PNGs 2016-04-27 01:27:57 +02:00
debug_font.png Optimize PNGs 2016-04-27 01:27:57 +02:00
demo_buttons.png Dilate & optimize non-dilated images 2020-11-24 11:15:24 +01:00
demo_buttons2.png Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
emoticons.png Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
file_icons.png Optimize PNGs 2016-04-27 01:27:57 +02:00
game.png Implement shields that remove specific weapon (fixes #4572) 2022-04-28 16:49:32 +02:00
gui_buttons.png Optimize PNGs 2016-04-27 01:27:57 +02:00
gui_cursor.png 0.7 cursor 2020-09-15 16:18:12 +02:00
gui_icons.png Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
gui_logo.png Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
particles.png Revert "Dilate & optimize non-dilated images" 2021-02-03 20:40:10 +01:00
strong_weak.png change name file 2021-08-14 18:40:58 +05:00
wordlist.txt Generate passphrase for save-code 2020-06-15 11:14:15 +02:00