ddnet/src/game
bors[bot] 797116fbfe
Merge #3316
3316: Disable ninja jetpack when player has telegun r=heinrich5991 a=def-

Required for map Taceht because of weapon tele interaction with jetpack

As requested by Cøke

## 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: def <dennis@felsin9.de>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
2020-11-19 13:06:24 +00:00
..
client Merge #3304 #3310 2020-11-18 23:43:22 +00:00
editor Check skin/sprite images for correctness 2020-11-18 07:59:15 +01:00
server Merge #3316 2020-11-19 13:06:24 +00:00
bezier.cpp Run clang-format 2020-09-26 21:50:15 +02:00
bezier.h Run clang-format 2020-09-26 21:50:15 +02:00
collision.cpp Fix float loops 2020-10-23 15:12:59 +02:00
collision.h Run clang-format 2020-09-26 21:50:15 +02:00
ddracecommands.h Reintroduce CMDFLAG_TEST 2020-10-11 16:27:28 +02:00
extrainfo.cpp Run clang-format 2020-09-26 21:50:15 +02:00
extrainfo.h Manual preparation for cleaner clang-format 2020-09-26 21:41:01 +02:00
gamecore.cpp Only use individual character flags for collision when ddnetchar is available 2020-11-08 14:05:44 +01:00
gamecore.h Fix obvious division by zero 2020-10-17 18:24:34 +02:00
layers.cpp Run clang-format 2020-09-26 21:50:15 +02:00
layers.h Run clang-format 2020-09-26 21:50:15 +02:00
localization.cpp Run clang-format 2020-09-26 21:50:15 +02:00
localization.h Run clang-format 2020-09-26 21:50:15 +02:00
mapbugs.cpp Fix variable names manually 2020-11-02 22:40:40 +01:00
mapbugs.h Remove code for CRC in most places, except where needed for net compat 2020-10-14 17:08:58 +02:00
mapbugs_list.h Revert "Add mapbug "stoppers-passthrough@ddnet.tw"" 2018-08-22 08:33:21 +02:00
mapitems.cpp clang-format: fix style 2020-09-14 16:00:51 +02:00
mapitems.h Use std::sort instead of bubble_sort 2020-10-08 08:00:01 +02:00
mapitems_ex.cpp Run clang-format 2020-09-26 21:50:15 +02:00
mapitems_ex.h Run clang-format 2020-09-26 21:50:15 +02:00
mapitems_ex_types.h Run clang-format 2020-09-26 21:50:15 +02:00
prng.cpp Run clang-format 2020-09-26 21:50:15 +02:00
prng.h Use check_header_guards script 2020-09-11 00:03:31 +02:00
teamscore.cpp Run clang-format 2020-09-26 21:50:15 +02:00
teamscore.h Fix out of bounds access in GetSolo 2020-10-18 16:52:29 +02:00
tuning.h Run clang-format 2020-09-26 21:50:15 +02:00
variables.h Merge #3257 2020-11-07 18:54:32 +00:00
version.h Version 15.2.2 2020-11-17 18:34:42 +01:00
voting.h Run clang-format 2020-09-26 21:50:15 +02:00