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

13612 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
sirius f62f6d2207 show play time move to a new function 2019-05-17 21:57:00 +08:00
sirius 8819f21d3a played time can show now 2019-05-17 21:47:12 +08: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 db5c17ce71 Avoid implementation-defined behaviour 2019-05-15 18:11:22 +02:00
Learath 0d39eb128d Use unsigned integers for colors 2019-05-15 18:05:19 +02: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
bors[bot] b03dad7626 Merge #1714 #1719 
1714: Make the color output more sane r=def- a=Learath2



1719: Show the correct button when paused r=def- a=Learath2

Fix one bug from #1702 

Co-authored-by: Learath2 <learath2@gmail.com>
 2019-05-11 08:13:24 +00:00
bors[bot] eb0eba1d4b Merge #1715 
1715: Don't show id for echo messages r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-05-11 08:02:27 +00:00
Learath2 b2f92b09eb Show the correct button when paused 2019-05-11 03:02:00 +02:00
Learath2 15879c16f9 Fix sticky binds 2019-05-11 02:46:22 +02:00
Learath2 e608e2f34f Add Hex display 2019-05-11 02:32:37 +02:00
Learath2 0dd67c92f1 Abbreviate alpha 2019-05-11 02:16:48 +02:00
Learath2 82e6d180e4 Use % and ° 2019-05-11 02:12:37 +02:00
Learath2 b059ac256e Show Alpha only if it's relevant 2019-05-11 02:12:36 +02:00
Learath2 39303e3430 Blood color is a light color 2019-05-11 01:02:46 +02:00
12pm 51ba68eaa6 Don't show id for echo messages 2019-05-11 00:26:15 +02:00
def c935b41026 Version 12.4.1 2019-05-10 23:47:41 +02:00
Dennis Felsing da6b2585f5
Merge pull request #1710 from 12pm/pr-rename-col 
Change col to color in variable names
 2019-05-10 23:47:00 +02:00
Dennis Felsing 2396096e3b
Merge branch 'master' into pr-rename-col 2019-05-10 23:46:38 +02:00
Dennis Felsing 9dd6cc9168
Merge pull request #1708 from 12pm/pr-restore-echo-col 
Restore old echo default color
 2019-05-10 23:45:03 +02:00
Dennis Felsing 984df9159f
Merge pull request #1711 from Learath2/dd_pr_compound_bind_compat 
Try to be more accomodating of old players
 2019-05-10 23:44:50 +02:00
Learath2 b41529fefd Try to be more accomodating of old players 2019-05-11 01:38:15 +02:00
12pm ea324592c6 Change col to color in variable names 2019-05-10 23:34:21 +02:00
12pm eda002993e Restore old echo default color 2019-05-10 23:07:32 +02:00
Emir Marincic 8fa6e72b4a
Merge pull request #1706 from Learath2/dd_pr_oops 
UI ID's need to be unique
 2019-05-10 21:18:17 +02:00
Learath2 08e19e60f4 UI ID's need to be unique 2019-05-10 23:15:14 +02:00
Dennis Felsing acd0cafaa0
Merge pull request #1704 from def-/pr-12.4 
Version 12.4
 2019-05-10 19:59:23 +02:00