edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
16594 commits 1 branch 428 tags 411 MiB
Commit graph

16594 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] c146de63fa
Merge #1909 
1909: Fix filescore path r=Learath2 a=ChillerDragon

The filescore system did not handle map paths well that were an actual path and not just the mapname.

```
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
```

I called ```Server()->``` in a thread so please review thread safety before merge.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-15 13:30:48 +00:00
ChillerDragon b39de87b18 Fix filescore path 
# before fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:29:44][filescore]: opening 'records/DDNetPP-maps-BlmapChill_record.dtb' for reading failed

# after fix
$ ./DDNet-Server 'sv_map "DDNetPP-maps/BlmapChill"'
[...]
[2019-09-15 13:31:05][filescore]: opening 'records/BlmapChill_record.dtb' for reading failed
 2019-09-15 13:35:35 +02:00
trml bb5eab0cc0 Add tunezone prediction 2019-09-09 00:53:07 +02:00
ChillerDragon f5f07860c4 Consistent spacing for getters and setters 2019-09-08 19:22:12 +02:00
bors[bot] 38f91d3891
Merge #1902 
1902: Remove useless votemute struct r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-09-07 20:21:43 +00:00
ChillerDragon dbad486c67 Remove useless votemute struct 2019-09-04 21:21:40 +02:00
bors[bot] f1b54d32b9
Merge #1901 
1901: Handle 0 star random map votes r=heinrich5991 a=12pm

0 star maps are a thing:
```
MariaDB [teeworlds]> select * from record_maps where stars = 0;
+-----------------+----------+--------+-------+----------------+---------------------+
| Map             | Server   | Points | Stars | Mapper         | Timestamp           |
+-----------------+----------+--------+-------+----------------+---------------------+
| CYO             | Moderate |      5 |     0 | =CuBe=         | 2015-07-31 13:35:00 |
| Flappy Bird     | Solo     |      0 |     0 | Saavik         | 2014-02-15 16:56:00 |
| NUT_short_race3 | DDmaX    |      0 |     0 | Zeta-Hoernchen | 2016-02-19 18:51:00 |
| NUT_short_race6 | DDmaX    |      0 |     0 | Zeta-Hoernchen | 2016-03-11 18:24:00 |
| NUT_short_race7 | DDmaX    |      0 |     0 | Zeta-Hoernchen | 2016-03-16 18:56:00 |
| SimplePlay      | Moderate |      5 |     0 | SBL            | 2014-05-13 00:04:00 |
| SimplePlay 2    | Moderate |      5 |     0 | SBL            | 2014-05-15 11:19:00 |
| SimplePlay 3    | Moderate |      5 |     0 | SBL            | 2014-05-18 00:20:00 |
| run_ankii       | Race     |      0 |     0 | Anki           | 2015-09-14 12:00:00 |
| run_blue        | Race     |      0 |     0 | Rainbow        | 2015-09-24 12:00:00 |
| run_g6          | Race     |      0 |     0 | Anki           | 2015-07-23 12:22:00 |
| run_orange      | Race     |      0 |     0 | Melone         | 2015-10-03 12:00:00 |
+-----------------+----------+--------+-------+----------------+---------------------+
12 rows in set (0.004 sec)
```

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-08-27 16:40:17 +00:00
12pm 3b1dcc8793 Handle 0 star random map votes 2019-08-27 18:33:37 +02:00
bors[bot] acfbaa203c
Merge #1899 
1899: Fix keeping tmp files on map change r=def- a=archimede67

This fixes an issue I noticed with replays. When you change the map but you stay on the same server, the temporary demo file used to save replays isn't deleted since the map name has changed.
This adds a way that will delete every single demo file in tmp/ directory under demos/replays, so that no more temporary files are kept.

Co-authored-by: Corantin H <archi0670@gmail.com>
 2019-08-21 21:14:14 +00:00
Corantin H 043859b66d Fix keeping tmp replay demo file on map change 2019-08-21 22:49:21 +02:00
Dennis Felsing fb3fa9d9ab
Merge pull request #1898 from Ryozuki/pr_fix_telegunsave 
Fix the telegun save
 2019-08-19 10:39:40 +02:00
Ryozuki b58037f31e
fix the telegun save 2019-08-19 10:35:37 +02:00
bors[bot] e2840b1a57
Merge #1881 #1895 
1881: Replace browse_icons (by MiM) (fixes #1880) r=heinrich5991 a=def-



1895: Centered entities text r=heinrich5991 a=BannZay

Closes https://github.com/ddnet/ddnet/issues/1721

Before:
![not_centered_100](https://user-images.githubusercontent.com/17499770/63204728-89772580-c0a3-11e9-8ad9-060cd03d2f74.png)
Now:
![centered_100](https://user-images.githubusercontent.com/17499770/63204730-8da34300-c0a3-11e9-86e2-5f542e4789a1.png)

It is done for "buffered" mode. Therefore, it works for OpenGL 3.3 only.


Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Andrii Vynychenko <bannzay3@yandex.ru>
 2019-08-17 15:32:29 +00:00
bors[bot] 75f25f348b
Merge #1875 
1875: Fix show_ips to show regular formatting (fixes #1873) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-08-17 15:21:24 +00:00
Andrii Vynychenko 4ab2b2010a Merge branch 'master' into centeredNumbers 2019-08-17 03:43:43 +03:00
Andrii Vynychenko 1671e6fbfc numbers dynamically centered for OpenGL 3.3 2019-08-17 03:42:54 +03:00
bors[bot] 77e59e3c49
Merge #1894 
1894: Fix max menu tabs (closed #1893) r=def- a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-08-16 09:06:44 +00:00
ChillerDragon ff49500659 Fix max menu tabs (closed #1893) 2019-08-16 00:58:06 +02:00
Andrii Vynychenko 0fa23a2c47 Numbers centered for OpenGL 3.3 2019-08-15 23:57:23 +03:00
bors[bot] 35b29ae01d Merge #1889 
1889: Dont reset variables twice r=def- a=fokkonaut

These variables get reset in Reset() aswell, no need to do it here

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-08-12 06:36:25 +00:00
fokkonaut 3434fca91c Dont reset variables twice 2019-08-12 05:28:42 +02:00
bors[bot] d513fc9a65 Merge #1885 
1885: Fix unmasked entities r=heinrich5991 a=fokkonaut

The unmasked flag should only influence the way front and game layer entities are rendered, because you cannot place tiles from the other layers anyways, not even with UNUSED on. Also, this creates some weird problems, afaik only on speedups layer tho, but still.
![ddnet exe Screenshot 2019 08 06 - 22 57 54 27](https://user-images.githubusercontent.com/35420825/62579486-354e9300-b8a4-11e9-8b86-1751a8015573.png)


Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-08-06 22:02:51 +00:00
fokkonaut fcc2e06352 Fix unmasked entities 2019-08-06 23:43:11 +02:00
bors[bot] b0f1164485 Merge #1883 
1883: Fix crashbug on set_team_ddr -1 r=Learath2 a=fokkonaut

Teams over 63 are also forbidden, so I check for that too.

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-08-05 16:37:32 +00:00
fokkonaut 265d3b8a62
Fix namings 2019-08-05 14:45:04 +02:00
fokkonaut ac588f324c Fix crashbug on set_team_ddr -1 2019-08-04 23:38:08 +02:00
def 6394924210 Replace browse_icons (by MiM) (fixes #1880) 2019-08-04 11:17:18 +02:00
Ryozuki e112cf6791
add paused and spec to explayerflags 2019-08-02 18:16:58 +02:00
Dennis Felsing 968b5c1fed Version 12.6.1 2019-08-02 07:33:15 +02:00
bors[bot] cb19e147d0 Merge #1876 
1876: Reset m_Afk r=heinrich5991 a=FallenKN

Guess this was forgotten

Co-authored-by: FallenKN <fallen.kn@gmail.com>
 2019-08-01 23:10:57 +00:00
FallenKN a03b4f0cee Reset m_Afk 2019-08-01 23:07:40 +02:00
def cb738ffed0 Fix show_ips to show regular formatting (fixes #1873) 2019-08-01 20:24:30 +02:00
def 99b814342c Add a few contributors 2019-08-01 18:36:21 +02:00
bors[bot] 17fd8ae79a Merge #1870 
1870: Clarify what `ENTITIES_UNUSED` does by renaming it r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-07-31 20:57:55 +00:00
bors[bot] d2aaa61ab9 Merge #1871 
1871: Clarify `-DDEV=ON` for CMake r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-07-31 20:39:41 +00:00
bors[bot] 85a8587f67 Merge #1872 
1872: Replace `str_comp_num` with `str_startswith` r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2019-07-31 19:44:37 +00:00
heinrich5991 9627fd0841 Clarify what ENTITIES_UNUSED does by renaming it 2019-07-31 21:22:11 +02:00
heinrich5991 1e2b8a4a3e Replace str_comp_num with str_startswith 2019-07-31 21:20:03 +02:00
bors[bot] 7dc1a05745 Merge #1868 
1868: Don't attempt to move DLLs on Linux (fixes #1867) r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-07-31 19:18:32 +00:00
heinrich5991 40eda06f7c Clarify -DDEV=ON for CMake 2019-07-31 21:15:34 +02:00
def 0018ed27df Don't attempt to move DLLs on Linux (fixes #1867) 2019-07-31 18:00:48 +02:00
Dennis Felsing c8b3670bbc
Merge pull request #1866 from def-/pr-12.6 
Version 12.6
 2019-07-31 17:31:24 +02:00
Dennis Felsing c8d12bd386
Merge pull request #1853 from 12pm/pr_unused_non_ddnet 
Render all entities on non ddnet servers
 2019-07-31 17:31:11 +02:00
Learath 6882db1da2 Introduce flag to render all entities 2019-07-31 15:20:17 +03:00
Dennis Felsing e791927541 Version 12.6 2019-07-31 07:20:21 +02:00
bors[bot] 7b1d2d3f23 Merge #1862 
1862: Add Sleepbubble to ClAfkMark r=def- a=FallenKN

With setting cl_afk_mark to 2 you will now get a sleepbubble on afk instead of the mark.

Which option should be default?
Also it displays chatbubble instead of sleepbubble when the playerflag is active. (I don't know which behavior is preferred)
Kept sleepy eyes on afk aswell.

 ![screenshot_2019-07-29_14-47-34](https://user-images.githubusercontent.com/13277346/62049848-624dd680-b210-11e9-82f7-2d20281eb899.png)

Co-authored-by: FallenKN <fallen.kn@gmail.com>
 2019-07-30 19:15:58 +00:00
FallenKN b2d3df8f75 Remove ClAfkMark option & rename it to ClAfkEmote 2019-07-30 20:19:46 +02:00
bors[bot] 9f48df6bf1 Merge #1865 
1865: SDL 2.0.10 r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-07-30 17:45:23 +00:00
bors[bot] 1d9191edfe Merge #1819 
1819: Show mapname in scoreboard r=def- a=ChillerDragon

![screenshot_2019-07-11_16-03-47](https://user-images.githubusercontent.com/20344300/61057588-e53ff600-a3f5-11e9-8b20-3b082172bd63.png)
![screenshot_2019-07-11_15-46-04](https://user-images.githubusercontent.com/20344300/61057605-ecff9a80-a3f5-11e9-8f59-68811a1b123a.png)

Not sure if this feature should exclude non ddrace gametypes. Or exclude standard maps. Or if the truncation limit should increase with bigger scoreboards.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-07-30 17:17:32 +00:00
def 6bb8e304f6 SDL 2.0.10 2019-07-30 19:14:28 +02:00