edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-15 04:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8945 commits 1 branch 429 tags 412 MiB
Commit graph

8945 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dennis Felsing a63f210a01 Fix segfault when deleting lock 2018-08-29 10:32:12 +02:00
Dennis Felsing c009a2184f
Merge pull request #1278 from ddnet/lock-style 
Lock style
 2018-08-27 17:18:25 +02:00
Dennis Felsing c29a72eb70 Lock style 2018-08-27 16:36:36 +02:00
Dennis Felsing c4fdbbe514
Merge pull request #1277 from ddnet/fix-lock 
Global lock for MySQL Connector's get_driver_instance (fixes #1131)
 2018-08-27 11:02:12 +02:00
Dennis Felsing 4d634bb7fd Global lock for MySQL Connector's get_driver_instance 
See note in https://dev.mysql.com/doc/connector-cpp/1.1/en/connector-cpp-examples-connecting.html

> get_mysql_driver_instance() calls get_driver_instance(), which is not
> thread-safe. Either avoid invoking these methods from within multiple
> threads at once, or surround the calls with a mutex to prevent
> simultaneous execution in multiple threads.
 2018-08-27 09:42:37 +02:00
heinrich5991 2a3ac81af9 Test make install on Travis 2018-08-26 22:07:32 +02:00
heinrich5991 cb09161dec Add a proper make install command 
It will install data into `share/ddnet`, client and server binaries into
`bin` and tools into `lib/ddnet`.

Fixes #1269.
 2018-08-26 21:44:31 +02:00
def 48d1757793 Fix bw support 2018-08-26 21:21:27 +02:00
def d92b7ef6b7 newline 2018-08-25 19:40:18 +02:00
def 23874f8ac2 grass_main automapper fix by Ravie 2018-08-25 19:39:30 +02:00
Dennis Felsing 49cd11022c
Merge pull request #1274 from Ryozuki/pr_safe_null_pointer 
it's safe to delete a null pointer
 2018-08-25 00:37:46 +02:00
Ryozuki dc4179b056 it's safe to delete a null pointer 2018-08-24 20:02:23 +02:00
Dennis Felsing 17ce784df8
Merge pull request #1271 from ChillerDragon/MacroSemicolon 
Remove useless semicolon
 2018-08-24 16:26:48 +02:00
ChillerDragon 273c545f4e Remove useless semicolon 2018-08-24 16:17:23 +02:00
Dennis Felsing 03098af933 Fix dnsbl initialization 
Don't set dnsbl state to pending when we someone connects over ipv6 and
the init will fail, leaving a null pointer in m_pDnsblLookup
 2018-08-24 14:24:34 +02:00
Dennis Felsing d2dcb4fe84
Merge pull request #1270 from Jupeyy/pr_nan 
Don't update particles, if no time passed
 2018-08-24 10:14:38 +02:00
Dennis Felsing dc08ac2d6d Version 11.4.2 2018-08-24 09:51:41 +02:00
Dennis Felsing 13aa154d47 Revert "Rewrite stopper code a bit" 
This reverts commit 4ee5c5a781.
 2018-08-24 09:34:54 +02:00
jupeyy 6c10eb13c0 Don't update, if no time passed 2018-08-24 05:56:33 +02:00
Dennis Felsing d5defd2853 Version 11.4.1 2018-08-23 10:00:28 +02:00
Dennis Felsing 6c90aadc08
Merge pull request #1265 from heinrich5991/pr_ddnet_cmake_install2 
(Re-?)add proper install target
 2018-08-23 10:00:06 +02:00
Dennis Felsing 39b36b2c3b Check file system operations and log them 2018-08-23 09:58:35 +02:00
Dennis Felsing 20ea1651cb Don't save non-client configs 2018-08-23 09:57:48 +02:00
Dennis Felsing e295a121e4 DDNET_INFO(_TMP) 2018-08-23 09:57:35 +02:00
Dennis Felsing 29dd3e29f7 Read ddnet-info.json from correct location 2018-08-23 09:36:20 +02:00
def 58927375fc Add message for failed database connection 2018-08-22 22:27:01 +02:00
Dennis Felsing 32265d11e5
Merge pull request #1268 from ddnet/revert 
Revert stopper fix
 2018-08-22 15:00:41 +02:00
Dennis Felsing 02e5fa20a0 Revert "Fix stoppers while retaining backward-compatibility" 
This reverts commit e2d3e353cf.
 2018-08-22 08:33:28 +02:00
Dennis Felsing d60b0db632 Revert "Add mapbug "stoppers-passthrough@ddnet.tw"" 
This reverts commit 25e86851d3.
 2018-08-22 08:33:21 +02:00
heinrich5991 15bca525b5 Ignore CMake install files for any install package 2018-08-21 22:04:10 +02:00
heinrich5991 f7afd76292 (Re-?)add proper install target 
This puts binaries in `bin` and the data dir into `share/ddnet`.
 2018-08-21 21:53:08 +02:00
bors[bot] 46bdc7af3e Merge #1252 
1252: fix #1226 r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2018-08-21 17:29:31 +00:00
fokkonaut 7a4fa97ef0 fuck this no-space-convention 2018-08-21 18:29:25 +02:00
fokkonaut 533d4fe574 allow for non-vanilla aswell and fixed some stuff 2018-08-21 18:27:34 +02:00
Dennis Felsing c3efb38d1d HTTP options should be saved 2018-08-21 14:50:36 +02:00
Dennis Felsing 63c7105c86 Version 11.4 2018-08-21 09:10:56 +02:00
Dennis Felsing 6f75cff582
Merge pull request #1259 from heinrich5991/pr_ddnet_mapbugs_sha256 
Also use sha256 for the mapbugs stuff
 2018-08-21 09:07:57 +02:00
Dennis Felsing f8e1056ea4
Merge pull request #1258 from heinrich5991/pr_ddnet_stopper_fix 
Fix stoppers while retaining backward-compatibility
 2018-08-21 09:06:22 +02:00
Dennis Felsing e2eb4a66dc Add Filter for connecting players (fixes #1263) 2018-08-21 09:03:48 +02:00
bors[bot] 36a243e395 Merge #1251 
1251: Selecting multiple quads r=def- a=Aerll

- shift+drag to select quads. Selection is additive
- left click on any empty space deselects all quads
- moving, resizing, rotating etc. works for every selected quad
- fixed resizing quads on grid and in properties. Vertices don't land on the same spot

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-21 06:31:06 +00:00
bors[bot] c4b9f8740f Merge #1261 
1261: Fix crash with FillSelection r=def- a=Learath2

`CLayerTiles::BrushGrab` needs to know which kind of layer a tile/brush was picked from, in case of the Tilesets this information was missing because it used to be provided by the selected layer.

Reported by Silex and Im 'corneum on Discord.

Co-authored-by: Learath <learath2@gmail.com>
 2018-08-21 06:14:16 +00:00
Learath af267ffea2 Forgot to remove ASan 2018-08-19 20:09:10 +03:00
Learath c5d69f9f63 Fix crash with FillSelection 2018-08-19 20:05:42 +03:00
heinrich5991 67d36b695d Also use sha256 for the mapbugs stuff 2018-08-19 12:12:11 +02:00
def 311e89c79d Fix votes 2018-08-16 21:42:10 +02:00
heinrich5991 25e86851d3 Add mapbug "stoppers-passthrough@ddnet.tw" 
This can be set for maps that rely on actually passing through stoppers.
 2018-08-16 17:54:55 +02:00
heinrich5991 e2d3e353cf Fix stoppers while retaining backward-compatibility 
Stopper behavior is only changed when the player would otherwise go
entirely through the stopper. Players can still enter a stopper as far
as the stopper can still affect them. One-way blockers have a bigger
range, and thus allow tees to enter furtherly.

A possible (manual) test map for this is test_stoppers.map, sha256sum
ed8be386e54a03d7bd7ed69fdd962c86f51f654427972d58d492c8905c8fbdb7, crc
48812a51.
 2018-08-16 17:54:55 +02:00
bors[bot] 00d86444b5 Merge #1255 
1255: Remove the unused import of the deprecated imp module r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-08-15 17:34:57 +00:00
bors[bot] 3f6031cab0 Merge #1256 
1256: Update bors.toml for CircleCI2 r=Learath2 a=heinrich5991

Status report names have changed.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-08-15 17:17:24 +00:00
heinrich5991 4ee5c5a781 Rewrite stopper code a bit 
Remove the whole copy-and-paste mess.

A seemingly ineffective and apparently code block has been removed.
 2018-08-15 17:47:07 +02:00