edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 10:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9233 commits 1 branch 424 tags 416 MiB
Commit graph

9233 commits

This branch
This branch
All branches
Author SHA1 Message Date
def 7e063109c6 Update view immediately when pasting in search in browser 2019-06-02 21:55:38 +02:00
def 9fc0f3c3a9 Update ddnet-libs 
openssl 1.1.1a -> 1.1.1c
curl 7.63.0 -> 7.65.0
freetype 2.9.1 -> 2.10.0
opus 1.3 -> 1.3.1
 2019-06-01 12:59:33 +02:00
bors[bot] 1578a33628 Merge #1760 
1760: Fix freeze projectiles only hit one tee (Fixes #1759) r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-05-31 11:59:15 +00:00
bors[bot] 647bbcc259 Merge #1732 
1732: Implement ISDDNET and Time Score cleanly r=def- a=Learath2

This is an attempt at implementing the two things in a cleaner way.

Deprecated #1320 
Willfix #1622  soon(tm)

Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: Learath2 <learath2@gmail.com>
 2019-05-31 10:12:10 +00:00
fokkonaut 85cbe99422 Fix wrong character team check 2019-05-30 14:14:47 +02:00
fokkonaut 61a6518f0d remove spaces 2019-05-29 16:30:44 +02:00
fokkonaut bbbdd89e64 Fix freeze projectiles only hit one tee (Fixes #1759) 2019-05-29 16:28:38 +02:00
bors[bot] e8b8a3c60a Merge #1756 
1756: fixed typo r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2019-05-26 20:50:19 +00:00
fokkonaut 14c7bf550a
fixed typo 2019-05-26 22:47:02 +02:00
bors[bot] f1d122d85b Merge #1754 
1754: Install .desktop and icon files on linux (make install) r=heinrich5991 a=Ryozuki

Fixes #1753

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
 2019-05-26 16:13:20 +00:00
Ryozuki bd1f6be080
add .desktop and ico installation 2019-05-26 18:11:48 +02:00
bors[bot] dc4111da12 Merge #1746 
1746: Fix zoom reset r=def- a=archimede67

Fix zoom reset when connecting dummy.
This should fix #1731 

Co-authored-by: Corantin H <archi0670@gmail.com>
Co-authored-by: archimede67 <archi0670@gmail.com>
 2019-05-23 11:30:23 +00:00
Dennis Felsing 05ae7c4b68 Version 12.4.3 2019-05-22 08:13:05 +02:00
Dennis Felsing 0eded7e406
Merge pull request #1744 from heinrich5991/pr_ddnet_quotefixquote_randommap 
Hack around the race condition in random maps selection
 2019-05-21 22:51:51 +02:00
Learath2 c98978c9d6 Implement timescore using a netobj 2019-05-21 10:26:33 +02:00
Learath 0d25bb86c4 Style 2019-05-21 10:25:15 +02:00
Learath c2a774275f Move AuthInfo into DDNetPlayer 2019-05-21 10:25:15 +02:00
Learath 1929bc6739 Implement ISDDNET. Deprecates #1320 2019-05-21 10:25:15 +02:00
Learath cd12a62252 Small cleanup 2019-05-21 10:24:07 +02:00
Learath 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
bors[bot] 34e96fa273 Merge #1747 
1747: Rerevert #1187 r=def- a=Learath2

Turns out this is right but with a catch, faster than vanilla projectiles get messed up.

@trml would you like to move the extrainfo bit up higher while at it?

Co-authored-by: Learath2 <learath2@gmail.com>
 2019-05-21 06:54:35 +00:00
Learath2 c7d8ca129a Rerevert #1187 2019-05-21 10:51:43 +02:00
archimede67 ba86bf7ff9
Update src/game/client/components/camera.cpp 
Better formatting

Co-Authored-By: heinrich5991 <heinrich5991@gmx.de>
 2019-05-20 20:39:02 +02:00
Corantin H 280f67af5f Fixed zoom reset when dummy connects 2019-05-20 12:07:07 +02:00
bors[bot] 131a0e370d Merge #1742 
1742: fix particles, emote wheel, zoom and score for blockworlds r=Learath2 a=kpro998

fixes a few things that got broken for players using ddnet client in blockworlds

Co-authored-by: Kpro998 <kpro998@gmail.com>
Co-authored-by: Learath <learath2@gmail.com>
 2019-05-19 22:51:06 +00:00
bors[bot] 077aa39b68 Merge #1739 
1739: Ignore binds in slice save menu r=Learath2 a=12pm

Should fix a bug reported in #1702

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-05-19 22:22:14 +00:00
Learath 66b1b44e07 Style 2019-05-20 00:18:19 +02:00
heinrich5991 096c87bd1d Hack around the race condition in random maps selection 
Revert this "once we get proper SQL code"™.
 2019-05-20 00:12:59 +02:00
Kpro998 f3ff81e5ab fix IsBlockInfectionZ duplication 2019-05-19 22:35:56 +01:00
Kpro998 0856fec38e fix particles, emote wheel, zoom and score for blockworlds 2019-05-19 22:11:16 +01:00
12pm 28f26a09cc Ignore binds in slice save menu 
Should fix a bug reported in #1702
 2019-05-19 13:33:30 +02:00
bors[bot] 959a0257db Merge #1729 
1729: Consistently determine OtherTeam r=def- a=Learath2

I think this looks correct, but it'd be nice if one more person can take a look.

Co-authored-by: Learath <learath2@gmail.com>
 2019-05-16 07:24:32 +00:00
Learath 551397117b Last return isn't necessary 2019-05-14 14:20:36 +02:00
Learath 546016092d Consistently determine OtherTeam 2019-05-14 00:00:28 +02:00
def 4e7598c22e Version 12.4.2 2019-05-13 11:33:53 +02:00
Dennis Felsing a562b573fd
Merge pull request #1717 from Learath2/dd_pr_bindstuck 
Fix sticky binds
 2019-05-13 11:29:35 +02:00
Dennis Felsing 0f65d02d1d
Merge pull request #1727 from trml/pr_pred_fixes_2 
A few more prediction fixes
 2019-05-13 07:29:04 +02:00
trml a885c64f4f Fix ninjajetpack prediction 2019-05-13 01:46:50 +02:00
trml 672b4aef02 Fix ninja animation with antiping off 2019-05-13 01:46:50 +02:00
trml 53fe0a56f8 Fix predicted weapon animation 2019-05-13 01:46:50 +02:00
trml bde2de2267 Improve weapon prediction on fastcap and vanilla 2019-05-13 01:46:35 +02:00
bors[bot] 574cff8e80 Merge #1722 
1722: Fix modern cmake version warnings r=heinrich5991 a=Ryozuki

OpenGL_GL_PREFERENCE must be LEGACY instead of GLVND otherwise i get a error complaining that glEnable is undefined

Fixes #1672 

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
 2019-05-12 12:37:12 +00:00
bors[bot] 3f41eab6b3 Merge #1724 
1724: fix crash on fontsize equal zero r=def- a=BannZay

#1718 fix

Co-authored-by: Andrii Vynychenko <bannzay3@yandex.ru>
 2019-05-11 16:36:51 +00:00
bors[bot] 1c99b7e6ce Merge #1725 
1725: Restore old team colors r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-05-11 16:22:20 +00:00
12pm a6a33bfaa5 Restore old team colors 2019-05-11 18:04:32 +02:00
Andrii Vynychenko 0353eb94ef fix zero fonsize 2019-05-11 18:59:47 +03:00
bors[bot] a84649c0ee Merge #1723 
1723: Explicitly filter finished maps r=def- a=12pm

Otherwise this filters all maps in all other tabs

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-05-11 11:49:22 +00:00
12pm 219d6dcd92 Explicitly filter finished maps 
Otherwise this filters all maps in all other tabs
 2019-05-11 13:45:41 +02:00
trml d9ade50e0a Disable grenade prediction with cl_predict 0 2019-05-11 13:25:08 +02:00
Ryozuki ed5b96c6b9
fix modern cmake version warnings 2019-05-11 12:00:21 +02:00