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

5671 commits

Author SHA1 Message Date
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 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
Learath2 c7d8ca129a Rerevert #1187 2019-05-21 10:51:43 +02:00
Corantin H 817bdaf9cd initial work on a replay system 2019-05-20 23:55:40 +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
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 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
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] 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
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
trml d9ade50e0a Disable grenade prediction with cl_predict 0 2019-05-11 13:25:08 +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
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 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 2396096e3b
Merge branch 'master' into pr-rename-col 2019-05-10 23:46:38 +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
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
Dennis Felsing 5e356b5327
Merge pull request #1692 from def-/pr-news 
Render news without STL functions
 2019-05-10 14:09:44 +02:00
Learath2 86fd363822 Keep the old default 2019-05-10 01:22:22 +02:00
Learath2 def36acce1 Apply alpha properly, fix refactoring fails 2019-05-10 01:00:24 +02:00
Learath2 06fc970ea1 Render the correct skin in the selector 2019-05-10 01:00:24 +02:00
def 7211d16ddb Version 12.4 2019-05-09 22:00:21 +02:00
def e1c9033300 Render news without STL functions (fixes #1693) 2019-05-09 21:54:56 +02:00
Andrew 0fffd7705f Cl_text_entities_size (#1632) 
* new command added

* fix code duplication after merge

* merge #1632 suggestions

* align the texture to the center vertically

* refactor

* fix RenderSwitchOverlay

* Update src/engine/client/text.cpp

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review

* Apply suggestions from code review

Co-Authored-By: BannZay <bannzay3@gmail.com>

* Apply suggestions from code review
 2019-05-06 14:19:10 +02:00
Dennis Felsing 76f2a5965f
Merge pull request #1701 from trml/pr_pred_fixes 
Some prediction fixes (fix #1680)
 2019-05-05 20:11:18 +02:00
Dennis Felsing 7ba1cae5f6
Merge pull request #1699 from trml/pr_extend_ddnetchar 
Add some more fields to ddnetcharacter
 2019-05-05 20:11:10 +02:00
trml 339d9b05f8 Also reset hook on prediction reset 2019-05-05 14:28:39 +02:00
trml 6848274b43 Fix pickup prediction on vanilla 2019-05-05 12:33:26 +02:00
trml 00ab99aa2e Add prediction for weapon switches and gunfire animation 2019-05-05 12:33:26 +02:00
trml b61aae5ab4 Reset predicted character on kill 2019-05-05 12:33:26 +02:00
trml df84e86ed0 Workaround for super prediction on non-64-player gametypes 2019-05-05 12:33:26 +02:00
trml 20c06dfcdf Make speedup and stopper prediction on all gametypes again 2019-05-05 12:33:13 +02:00
trml 8eb4b7fd71 Add setting cl_predict_freeze 2 for having a small amount of misprediction while frozen 2019-05-05 12:32:06 +02:00
trml b27a124e17 Enable freeze prediction with antiping off, and enable superjump prediciton on non-ddrace servers 2019-05-04 22:20:47 +02:00
Learath 13807edc6a Don't apply colorscale to alpha 2019-05-03 20:37:32 +02:00
bors[bot] 0b7ca35414 Merge #1697 
1697: Don't check dnsbl when alone r=def- a=Learath2

Should help relieve some of the issues reported on discord.

Co-authored-by: Learath <learath2@gmail.com>
 2019-05-02 05:29:06 +00:00
trml 09401a83ec Add strong/weak id to ddnetcharacter 2019-05-02 00:34:20 +02:00
trml ae57b7f205 Add more fields to ddnetcharacter 2019-05-02 00:34:03 +02:00
Learath b86c457c91 Remember whether a color is lit or not 2019-05-01 23:35:29 +03:00
Learath 57f58cc9c7 Refactoring mishap 2019-05-01 22:57:14 +03:00
Learath ca888c56a2 Lighten when rendering the teeselector aswell 2019-05-01 22:49:52 +03:00
Learath 5d0a1c8d0a Unlighten colors when sending to server 2019-05-01 22:49:52 +03:00
Learath 689c7b29be Don't check dnsbl when alone 2019-05-01 14:54:51 +03:00
Learath a451bb15c5 Dummy colors are also colors 2019-05-01 14:19:38 +03:00
Learath b16c0b8aaf Lighten the default authed color 2019-05-01 14:15:00 +03:00
Learath bfeef8f9ad Use the color macro 2019-05-01 14:05:39 +03:00
Learath f479f69735 Add a flag for colors with alpha 2019-05-01 13:58:51 +03:00
Learath 3cfbd8376f Forgot default color for ui 2019-05-01 10:27:04 +03:00
bors[bot] a2f44299e0 Merge #1678 
1678: Handle colors in console r=def- a=Learath2

DEPENDS: #1654 

A better way to fix #1581 possibly deprecates #1597 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-30 19:39:56 +00:00
Learath f9ab06476d Lighten tee colors of others 2019-04-30 19:49:53 +03:00
12pm 3f76e17830 Fix FillSelection with no selected brush 
As reported by BannZay on Discord
 2019-04-30 14:24:13 +02:00
bors[bot] d8964ceedb Merge #1654 #1685 
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-29 15:56:16 +00:00
bors[bot] 70b3f1db21 Merge #1675 
1675: Remove unused vanilla code (closed #1658) r=def- a=ChillerDragon

Removed vanilla code from gamecontext and gamecontroller. I didn't search for the code all over the place I just remember seing it there a lot. Also removed some empty lines. Wanted to do this for a long time :)

thought there is an reason it is there. But we have git and the vanilla repo so I don't see any point keeping it there.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-29 07:24:01 +00:00
12pm 8fa6dada95 Highlight same clan as dummy too 
Fixes #1686
 2019-04-29 00:48:40 +02:00
Learath 6a1ef1af62 Can't access a siblings protected members? 2019-04-28 20:34:34 +03:00
Learath 2975d6998d Block ctrl+shift+ binds. Fixes #1490 2019-04-28 20:30:17 +03:00
Learath 66c89eafb2 Allow binding with modifiers in settings 2019-04-28 20:22:19 +03:00
Learath 1da935f4c1 Fix stuck input 2019-04-28 16:52:10 +03:00
Learath c0c79c69c3 Fix output 2019-04-28 16:37:20 +03:00
Learath 6b815b2375 Work on compound binds 2019-04-28 16:32:49 +03:00
bors[bot] a5096c4de0 Merge #1663 
1663: Use freeze end tick instead of a flag. Fix #1659 r=def- a=Learath2

I used -1 for deep frozen, and 0 for not frozen. Not really sure if this is the best way.

Co-authored-by: Learath <learath2@gmail.com>
 2019-04-27 08:53:38 +00:00
Learath 588acdda0d Consolidate color configs, extend debugging 2019-04-27 02:02:31 +03:00
Learath 979d58f830 Use colors in CTextRender 2019-04-27 01:34:20 +03:00
Learath 6c371a9a57 Even more refactoring 2019-04-27 01:11:15 +03:00
Learath 15058330fa Don't inherit from vector, more cleanup 2019-04-27 00:47:34 +03:00
Learath 929d772071 Collateral 2019-04-26 22:38:18 +03:00
Learath 93d14a1eca Inconvenience for windows 2019-04-26 22:36:49 +03:00
Learath 69d78c21b4 Lighten tee colors 2019-04-26 16:38:16 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath 93265dbb9c Please MSVC 2019-04-25 21:09:32 +03:00
Learath e637064a68 Don't store HSL separately 2019-04-25 19:49:27 +03:00
Learath 95a3a69e08 Start phasing out vectors for colors 2019-04-25 18:21:35 +03:00
Learath 0f781df1dd Try handling colors in console 2019-04-25 14:48:53 +03:00
Dennis Felsing aa5458b81d Version 12.3.1 2019-04-25 08:20:01 +02:00
Dennis Felsing ab8b807c5d Shorten strings correctly (fixes #1652) 
Using a string to format itself is undefined behaviour.
 2019-04-25 08:19:31 +02:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
ChillerDragon ad7a2cdef2 Remove unused vanilla code (closed #1658) 2019-04-24 22:36:47 +02:00
def 4f99623b5e Version 12.3 2019-04-24 19:49:00 +02:00
Dennis Felsing a1a581ecc2
Merge pull request #1653 from Ryozuki/pr_use_ddnetnetchar 
Use the DDNet Network Character
 2019-04-24 19:47:12 +02:00
def b6d2ed268a another one 2019-04-24 18:33:31 +02:00
Learath 24408e6f3c Oops 2019-04-24 19:12:46 +03:00
def 6cf8999a2f Restore old FindEntities behaviour, make it usable to count entities 2019-04-24 18:01:30 +02:00
trml 0b5f387779 Remove unneded check 2019-04-24 17:04:51 +02:00
trml 1db0d2ff40 Don't use freeze and deepfreeze flags for prediction yet 2019-04-24 15:56:56 +02:00
trml 2f35c64e6e Initialize array and fix warning 2019-04-24 15:56:07 +02:00
Ryozuki 502ebc5628 fix all conflicts 2019-04-23 20:45:54 +02:00
Ryozuki 42a5d7a9c1 fix conflicts 2019-04-23 20:42:07 +02:00
Dennis Felsing dc1e638fb9
Merge pull request #1664 from Learath2/dd_pr_solofix 
Fix solo bug
 2019-04-23 20:03:58 +02:00
Dennis Felsing 3f99dfdbcd
Merge pull request #1666 from Ryozuki/pr_fix_solo_spec 
fix ghosts in spec
 2019-04-23 20:03:01 +02:00
Ryozuki 87c797e84d fix ghosts in spec 2019-04-23 19:22:58 +02:00
bors[bot] 526af034dd Merge #1620 
1620: Rewrite of prediction code, with additional prediction (updated) r=def- a=trml

This is a reworked attempt at a rewrite of the prediction code (#464), to allow for more client side prediction. It doesn't fix the duplication of server code, but the client code should otherwise be cleaner. This includes separating prediction code out of gamecore/gameclient, and a refactor of the rendering of predicted characters.

There is also prediction for some new things, and some other changes:
- prediction of laser, shotgun, ninja, fng hammer, pickups and ddrace tiles (freeze/unfreeze tiles with cl_predict_freeze)
- laser and bullets are rendered when you fire them and bullets don't go through walls (when both cl_antiping_grenade and cl_antiping_weapons are enabled)
- antiping for flags
- prediction of dummy input
- an additional smoothing option that attempts to make antiping less jumpy (cl_antiping_smooth)

Co-authored-by: trml <trml@users.noreply.github.com>
Co-authored-by: trml <trml@noreply.github.com>
 2019-04-23 17:11:21 +00:00
Learath 5d4461981a Fix solo bug 2019-04-23 19:46:51 +03:00
Learath 67668d7fb2 Use freeze end tick instead of a flag. Fix #1659 2019-04-23 18:57:26 +03:00
bors[bot] 34542e64b5 Merge #1655 
1655: Add delete projectiles on death settings r=def- a=12pm

Need this for a map fix and doesn't hurt to have for grenades too I guess. Defaults are still the same

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-23 14:43:23 +00:00
12pm 808bb1303a Disable demo shortcuts in console 
As reported here: https://forum.ddnet.tw/viewtopic.php?f=3&p=67807#p67807
 2019-04-23 14:52:32 +02:00
trml 681f30950c Remove the dummy prediction 2019-04-23 02:01:17 +02:00
trml 3d8bd174e7 Add extended data to CCharacter and improve prediction of super/solo/endless/superjump 2019-04-22 00:38:24 +02:00
12pm a83e3e0d9a Add delete projectiles on death settings 2019-04-21 20:17:41 +02:00
Ryozuki d6cc94f839
fix hook col a bit 2019-04-21 19:35:07 +02:00
trml 78c8f42784 Put public members in a single block 2019-04-21 16:12:21 +02:00
trml e88459acec Make more variables private 2019-04-21 16:12:21 +02:00
trml 92ef0b0707 Collapse if statements 2019-04-21 16:12:21 +02:00
trml 0b3f3b03b5 Rewrite of prediction code, with additional prediction 2019-04-21 16:12:20 +02:00
Ryozuki 7d4fdb3322
update the core server-side 2019-04-21 15:16:28 +02:00
Ryozuki 6bfdad9771
fix super and solo 2019-04-21 14:57:45 +02:00
Ryozuki eecdfd2af8
fix hook and colision on super 2019-04-21 10:45:11 +02:00
def fc68f3add1 Version 12.2 2019-04-20 12:40:55 +02:00
Ryozuki eaef31d4a0
fix wording and add/fix no col and no hook 2019-04-19 11:59:09 +02:00
Ryozuki 0f3411f8fa
fix wording 2019-04-19 11:46:54 +02:00
Ryozuki f37f8a8268
add all character flags to ddnetnetwork character 2019-04-19 11:17:28 +02:00
bors[bot] bbf485a9ac Merge #1628 
1628: Make client know about other solo players, fixes #258 r=heinrich5991 a=Ryozuki

When another player is in solo and you are not, you could notice a weird collision and also the hook moving a little towards the solo player. This as been fixed.

It also applies m_ClShowOthersAlpha to other players whenever you are on solo or others are.

It uses the protocol extension thingy.

fixes #258 

Co-authored-by: Ryozuki <ryo@ryozuki.xyz>
Co-authored-by: Learath <learath2@gmail.com>
 2019-04-18 23:03:52 +00:00
bors[bot] f15dd6303e Merge #1648 
1648: Fix mute typo r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-18 20:00:53 +00:00
12pm 997e01bf31 Fix mute typo 2019-04-18 20:54:22 +02:00
Dennis Felsing 04ac4932c6
Merge pull request #1645 from def-/pr-str_copy_num 
str_num_copy -> str_truncate, as in Vanilla 0.7
 2019-04-18 10:25:25 +02:00
Dennis Felsing 00c87c121a str_num_copy -> str_truncate, as in Vanilla 0.7 2019-04-18 10:25:01 +02:00
Learath d6bfef2cc0 Use a NetObj instead of a system message 2019-04-17 23:47:32 +02:00
12pm 7901cc26ad More reasonable layer size limits 2019-04-17 21:48:23 +02:00
12pm 50236ca45c Add editor copy & paste 2019-04-17 21:47:52 +02:00
Dennis Felsing 6e74d9d728 remove debugging 2019-04-17 14:12:35 +02:00
Dennis Felsing b425495f45 Fix draggers 2019-04-17 12:58:53 +02:00
def 9f3df78cae Fix typo 2019-04-16 20:37:12 +02:00
Learath 843dc29a88 Names can include quotes :/ 2019-04-16 02:39:22 +02:00
Learath dd62629ee9 Clean statboard chat parsing a bit 2019-04-16 01:47:12 +02:00
bors[bot] de5970579b Merge #1642 
1642: Add some demo player shortcuts r=def- a=12pm



Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-15 19:22:10 +00:00
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +02:00
bors[bot] 091e41206c Merge #1635 
1635: Editor save menu improvements r=Learath2 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-15 18:40:34 +00:00
def 9dddb290dd File score: Implement negative top5 (fixes #1631) 2019-04-15 18:55:33 +02:00
Dennis Felsing aad18ebb86
Merge pull request #1624 from ChillerDragon/pr_refactor_mute 
Refactor mute and vote mute code
 2019-04-13 17:52:55 +02:00
FallenKN c69c4727ef removed unnecessary brackets 2019-04-13 15:22:31 +02:00
FallenKN 83b385f8a5 Fix #1636 2019-04-13 14:33:25 +02:00
def f1cf222e95 Editor: Don't enter directory name in filename in save menu 2019-04-13 13:21:05 +02:00
def 598c8cf1c6 Editor: Left align "New folder" button in save menu 2019-04-13 13:21:00 +02:00
def 87f588d8a3 Editor: Don't jump to first entry in file list when editing 
Fixes saving a new map when a subdirectory already exists
 2019-04-13 13:20:56 +02:00
ChillerDragon deaab4bb4b Add functions instead of goto 2019-04-12 19:50:02 +02:00
Ryozuki fb84bd1f0b
fix prediction when antiping is on 2019-04-12 17:08:06 +02:00
Ryozuki c686ceea53
Merge branch 'master' into pr_fix_solo 2019-04-12 16:34:43 +02:00
Ryozuki 3556830b9a
fix solo prediction 2019-04-12 16:29:13 +02:00
Ryozuki 7e43120b6e
make the client aware of other players solo status 2019-04-12 16:16:21 +02:00
bors[bot] 826a7781ae Merge #1621 
1621: Actually enable -Wuseless-cast r=heinrich5991 a=def-

It's not supported in C and we only checked using a C compiler.

Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-12 00:08:19 +00:00
12pm a1dd2e45a5 Fix non destructive drawing with hookthrough shortcut 
Fixes #1623
 2019-04-11 21:43:22 +02:00
ChillerDragon a6d00973e1 Refactor mute and vote mute code 2019-04-11 20:10:04 +02:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast 
But don't enable it yet because I'm not sure what the best way is.
 2019-04-11 19:54:43 +02:00
bors[bot] cde3781184 Merge #1616 
1616: Minor CFileScore improvements r=heinrich5991 a=def-

It's written using STL strings and files intead of using system. Didn't change any of that because of the risk of breaking something unintentionally.

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 09:41:01 +00:00
def 0a286b1d94 File score: report file opening errors 2019-04-11 08:15:14 +02:00
bors[bot] 279eeed9fc Merge #1614 
1614: Remove unmaintained Android code (fixes #1575) r=heinrich5991 a=def-

Thoughts?

Co-authored-by: def <dennis@felsin9.de>
 2019-04-11 00:02:17 +00:00
bors[bot] 92a0dc8366 Merge #1618 
1618: Implement color_to_rgb r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-10 23:38:29 +00:00
def 2eab795c9e Implement color_to_rgb 2019-04-10 22:45:30 +02:00
fokkonaut 15658b3b10
removed brackets 2019-04-10 22:13:10 +02:00
def 279d6e60ca No duplicate () on rank 2019-04-10 22:05:44 +02:00
fokkonaut b92607eb7d
fix no score when joining when using file based score 2019-04-10 21:40:31 +02:00
def 94f3d97ddf Remove unmaintained Android code (fixes #1575) 2019-04-10 19:40:50 +02:00
def 11127f9344 Release fixes 2019-04-10 17:57:56 +02:00
Dennis Felsing 93b88647eb
Merge pull request #1612 from def-/pr-12.1 
Version 12.1
 2019-04-10 17:38:37 +02:00
Dennis Felsing ed34dcfec5
Merge pull request #1602 from def-/pr-explain-tiles 
Explain game tiles and entities in editor (fixes #1600)
 2019-04-10 17:38:22 +02:00
Dennis Felsing 2d69935a6b Add explanations for TILE_THROUGH_CUT/ALL/DIR 2019-04-10 15:48:23 +02:00
bors[bot] f0cce17bfc Merge #1597 
1597: Console command "color_from_rgb" (fixes #1581) r=heinrich5991 a=def-

Converts RGB colors to TW's HSL format

Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: Dennis Felsing <dennis@felsin9.de>
 2019-04-10 12:21:19 +00:00
Dennis Felsing fc5810fa56 Version 12.1 2019-04-10 14:17:06 +02:00
Dennis Felsing bd4e3716a1 color -> color_from_rgb 2019-04-10 08:58:08 +02:00
bors[bot] b05b268a6a Merge #1598 #1601 #1605 #1606 #1607 #1609 
1598: Fix home/end keys in console r=heinrich5991 a=def-



1601: 2 more tries to force DB to respond in UTF8 (fixes #1599) r=heinrich5991 a=def-



1605: Fix memory leak in draggers r=heinrich5991 a=def-



1606: Always initialize m_InfosLoaded r=heinrich5991 a=def-

otherwise it's uninitialized and then read, found by valgrind --tool=memcheck

1607: Enable a few more GCC warnings r=heinrich5991 a=def-



1609: Fix C90 compatibility on Windows r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-09 22:09:18 +00:00
def fe432b8ae4 Enable a few more GCC warnings 2019-04-09 22:05:21 +02:00
Dennis Felsing bdb579330d Improve game tile explanations a bit 
As suggested by Bojidar and jao
 2019-04-09 14:23:40 +02:00
bors[bot] d4d6ab681d Merge #1593 
1593: Add emacs style ctrl-a ctrl-e navigation r=def- a=ChillerDragon

Im sure im not the only one who keeps pressing ctrl-a and ctrl-e in the teewoods console and nothing happens .-.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-09 10:54:04 +00:00
ChillerDragon 0b18d6eb44 Remove if nesting for compose keys in console 2019-04-09 12:11:29 +02:00
def 05fe69751d Add jao's explanations for telegun 2019-04-08 22:36:47 +02:00
def c3e36ee483 Always initialize m_InfosLoaded 2019-04-08 22:13:47 +02:00
def 708019c675 Grammar fix: Catched -> Caught 2019-04-08 21:54:33 +02:00
def 173b43d487 Fix memory leak in draggers 2019-04-08 21:54:12 +02:00
12pm 7b95d38bf3 Fix crash when draggers don't have a number 2019-04-08 21:47:22 +02:00
def eda16acbca Explain game tiles and entities in editor (fixes #1600) 
- Explanations by Lady Saavik taken from https://ddnet.tw/explain/
- CCW/CW were mixed up in enum names, fixed
- Make sure that the texts fits, otherwise reduce font size
- Still need explanations for Portal tiles
 2019-04-08 19:39:56 +02:00
def 527859e70c Fix home/end keys in console 2019-04-07 23:28:30 +02:00
def 01ffde25f3 Console command "colors" (fixes #1581) 
Converts RGB colors to TW's HSL format
 2019-04-07 22:54:29 +02:00
Ryozuki be708d0498
a mess 2019-04-07 21:18:43 +02:00
Ryozuki 0138dd32e3
apply alpha to solo players 2019-04-07 19:42:26 +02:00
Ryozuki 813c24bf29
add m_IsSolo and fix hook col 2019-04-07 18:58:49 +02:00
ChillerDragon e9f8bd42b7 Add emacs style ctrl-a ctrl-e navigation 2019-04-07 15:59:15 +02:00
bors[bot] 4931d00201 Merge #1589 
1589: Remove some code duplication in CSaveTee::LoadString r=def- a=def-

by using a switch-case with fallthroughs, seems like the perfect use case.

Co-authored-by: def <dennis@felsin9.de>
 2019-04-07 12:01:59 +00:00
bors[bot] 5d9d0d7d35 Merge #1587 
1587: Small fixxings r=heinrich5991 a=ChillerDragon



Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2019-04-06 21:08:40 +00:00
def e27679ebcc Remove some code duplication in CSaveTee::LoadString 
by using a switch-case with fallthroughs
 2019-04-06 20:28:47 +02:00
Ryozuki 52b58c3d5b
final fix 2019-04-06 18:38:25 +02:00
Ryozuki 69fd7f1767
fix and add gameuuid 2019-04-06 18:37:25 +02:00
Ryozuki fb398ebcbf
better this way 2019-04-06 18:19:56 +02:00
Ryozuki beeda4d7bb
fix warnings 2019-04-06 18:18:46 +02:00
Ryozuki b92b2f1878
save telegun on /save 2019-04-06 18:13:11 +02:00
ChillerDragon 905204781b Cleanup if nesting 2019-04-06 17:22:15 +02:00
ChillerDragon ce5a7ea626 Remove one of two graphic includes 2019-04-06 17:07:17 +02:00
bors[bot] ea82402e7e Merge #1574 
1574: Updater localization and update language files r=heinrich5991 a=def-



Co-authored-by: def <dennis@felsin9.de>
 2019-04-06 14:53:46 +00:00
bors[bot] 2f4dd5ae2c Merge #1572 
1572: cl_mouse_min_distance as requested by Makoyuri r=heinrich5991 a=def-

also cl_dyncam_min_distance

Co-authored-by: def <dennis@felsin9.de>
 2019-04-06 14:17:25 +00:00
def 9df30dc235 Localize mentions 2019-04-06 15:18:40 +02:00
def 330a99686d Add localization for updating output 2019-04-06 15:18:35 +02:00
12pm 98bfeb3e72 Notify about chat mentions in editor 2019-04-06 11:32:50 +02:00
Ryozuki f0a4da58cb
Merge branch 'master' into add_clan_color 2019-04-05 16:46:14 +02:00
Ryozuki 4e3b2191a2
fix wrong variable 2019-04-05 13:47:38 +02:00
Ryozuki 06e8a07b99
fix phrasing 2019-04-05 13:36:18 +02:00
Ryozuki 735aab9609
fix braces 2019-04-05 13:25:17 +02:00
Ryozuki bb3cde4369
add color to ping in scoreboard 2019-04-05 13:12:08 +02:00
Ryozuki ef6d4b5de6
add clan color to people with same clan as you 2019-04-05 12:41:01 +02:00
def e31561eb47 cl_mouse_min_distance as requested by Makoyuri 
also cl_dyncam_min_distance
 2019-04-04 20:19:37 +02:00
Dennis Felsing a7dabe3475
Merge pull request #1570 from 12pm/playerflags 
Add playerflags, dnsbl, and ips for non-admins in status
 2019-04-04 18:55:40 +02:00
Dennis Felsing fc76c2219f
Merge pull request #1566 from def-/pr-demo-speed 
Demo speed improvements
 2019-04-03 19:02:42 +02:00
12pm a7ef921e3f Add playerflags, dnsbl, and ips for non-admins in status 2019-04-03 15:07:05 +02:00
bors[bot] d72929d33b Merge #1567 
1567: Make world offset calculation more accurate r=def- a=12pm

Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
 2019-04-03 06:08:15 +00:00
12pm 4efc0e3b82 Make world offset calculation more accurate 
Noticed that after some time groups with a parallax different than 100 were incorrectly rendered in the editor
 2019-04-03 01:05:38 +02:00
def 9daa3beacd Broadcast: Fix display time during demo replay 
Only show for the same amount of ticks as originally, not number of
seconds, otherwise at high demo speeds you will see the broadcast for a
much longer game play time than originally.
 2019-04-02 23:28:13 +02:00
12pm ff48221797 Validate game layer hookthrough shortcut 
Fixes #1556
 2019-04-02 22:55:12 +02:00
def ef0e685496 Make timestamp consistent in scores 
The motivation is to have the exact same timestamp for every member
finishing in a team and the team rank as well. This makes the database
more consistent and tooling easier.
 2019-04-02 20:18:40 +02:00
def ea6c69c273 Version 12.0.1 2019-03-30 17:01:00 +01:00
Dennis Felsing 0b76009644
Merge pull request #1553 from def-/pr-official-tab 
No checkmark in DDNet/KoG tab (as suggested by Alexander)
 2019-03-30 17:00:12 +01:00
Dennis Felsing 20f5d20692
Merge pull request #1552 from def-/pr-fix-confirm-time 
Fix cl_confirm_disconnect/quit_time (fixes #1550)
 2019-03-30 17:00:02 +01:00
Dennis Felsing 7f28f882c2
Merge pull request #1551 from def-/pr-sql-command-completion 
Command completion for /times, /points and /top5points
 2019-03-30 16:59:50 +01:00
def c0d3f5fa57 Actually disconnect dummy after confirmation (fixes #1555) 2019-03-30 16:59:25 +01:00
def 3248d94ace No checkmark in DDNet/KoG tab (as suggested by Alexander) 2019-03-29 23:08:11 +01:00
Dennis Felsing 0b578c4330 Fix cl_confirm_disconnect/quit_time (fixes #1550) 
-1 now works as described
Split into two settings
 2019-03-29 14:56:02 +01:00
Dennis Felsing 2dd78b6568 Command completion for /times, /points and /top5points 
Still not implemented for file based servers of course
 2019-03-29 14:39:48 +01:00
bors[bot] 5c919b6aab Merge #1549 
1549: Allow editing texture UV offsets in Quad properties r=def- a=bojidar-bg

Partial manual cherrypick of de82ad7a26.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2019-03-29 13:11:18 +00:00
Bojidar Marinov 6ca6fce0b2
Allow editing texture UV offsets in Quad properties. 
Manual cherrypick of de82ad7a26, original code by @cinaera
 2019-03-29 13:38:21 +02:00
def 4645b69401 Version 12.0 2019-03-28 23:39:30 +01:00
Dennis Felsing d12ad9d05f
Merge pull request #1548 from def-/pr-vote-mute 
Remove vote mute after it expired (fixes #1544)
 2019-03-28 23:38:45 +01:00
Dennis Felsing 4ed50440a8
Merge pull request #1547 from def-/pr-kill-harder 
After a char was killed stop processing further tiles
 2019-03-28 23:38:39 +01:00
Dennis Felsing 138a9c6ff7
Merge pull request #1545 from def-/pr-load-font 
Move out common font loading into method
 2019-03-28 23:38:24 +01:00
Dennis Felsing 95cc357dd6
Merge pull request #1540 from def-/pr-disconnect-time 
Add cl_confirm_disconnect_quit_time (fixes #1530)
 2019-03-28 23:38:16 +01:00
Dennis Felsing 72200a4e09
Merge pull request #1539 from def-/pr-esc-popup 
Escape during popup: Only make popup disappear
 2019-03-28 23:38:00 +01:00
Dennis Felsing 11fee99b9c
Merge pull request #1538 from def-/pr-kog-tab 
Add KoG tab in server browser
 2019-03-28 23:37:50 +01:00
def 09412f43f7 Remove vote mute after it expired (fixes #1544) 2019-03-28 23:35:51 +01:00
def c489fb61be After a char was killed stop processing further tiles 2019-03-28 23:29:34 +01:00
def 9e25f4c113 Move out common font loading into method 2019-03-28 21:51:42 +01:00
12pm 427171bb17 Merge "Add Quad/Sound" + shortcut to add them at mouse position, add quads true to size 2019-03-28 13:41:07 +01:00
12pm 0abbba4c5d Add non-destructive brush drawing 
New brush draw mode that doesn't override existing tiles. Empty brush still acts as an eraser. Button and ctrl+d shortcut to toggle it.
 2019-03-26 19:19:25 +01:00