Commit graph

2415 commits

Author SHA1 Message Date
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 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06: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 cc36af73be Cleanup colors 2019-04-24 23:53:26 +03: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
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 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 67668d7fb2 Use freeze end tick instead of a flag. Fix #1659 2019-04-23 18:57:26 +03: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
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 6bfdad9771
fix super and solo 2019-04-21 14:57:45 +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
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
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
12pm 6e880644af Add some demo player shortcuts 2019-04-15 21:08:12 +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
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
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] 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
def 2eab795c9e Implement color_to_rgb 2019-04-10 22:45:30 +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
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 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
ChillerDragon 0b18d6eb44 Remove if nesting for compose keys in console 2019-04-09 12:11:29 +02:00
def c3e36ee483 Always initialize m_InfosLoaded 2019-04-08 22:13:47 +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 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] 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
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 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 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 fc76c2219f
Merge pull request #1566 from def-/pr-demo-speed
Demo speed improvements
2019-04-03 19:02:42 +02: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
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
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 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 9e25f4c113 Move out common font loading into method 2019-03-28 21:51:42 +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
def e6f327ef06 Move ingame browser tabs all the way left 2019-03-26 17:38:46 +01:00
def 8908102536 Add cl_confirm_disconnect_quit_time (fixes #1530)
Number of minutes of active racing time before being asked to confirm
disconnecting, disconnecting dummy or quitting through GUI. Defaults to
20 minutes, -1 to disable, 0 to always enable.

Also removed confirmation to quit when in main menu, except when having
an unsaved map in editor.

Spectate and kill should already be safe thanks to server-side kill
protection.
2019-03-25 20:10:38 +01:00
def d31e9833f9 Escape during popup: Only make popup disappear
Not the menu. Otherwise when opening the menu again the popup will
reappear for one frame before disappearing.
2019-03-25 20:01:10 +01:00
def bf576723a3 Add KoG tab in server browser
- As requested by qshar and KoG players
- Similar to DDNet tab
- Info fetched from servers-kog entry from https://info.ddnet.tw/info
- Also supports countries and types
- Doesn't inform whether map has been finished
- Generalized the code a bit but it's still ugly
- Depends on #1533, also shows KoG servers as official/verified
2019-03-24 23:15:40 +01:00
Dennis Felsing 05f927b8ca
Merge pull request #1507 from ddnet/chat-command-autocomplete
Autocomplete chat commands (fixes #1504)
2019-03-21 19:12:52 +01:00
def 82f9474eb4 Leave space for \0 byte (fixes #1526) 2019-03-20 18:27:08 +01:00
Dennis Felsing abe9f6f5a9
Merge pull request #1518 from ddnet/fetch-info
Demo browser: Make Fetch Info a checkbox instead
2019-03-20 07:45:12 +01:00
bors[bot] b1f3692980 Merge #1514 #1521 #1522 #1523
1514: Square and center icons before rendering them on button r=Learath2 a=def-



1521: Remove unused norank icon from browse_icons.png r=heinrich5991 a=def-



1522: Reset authed level in client r=Learath2 a=def-

As reported by jao on Discord:

22:26 jao @Learath2 client auth level needs to reset on server join or something
22:28 jao because other servers don't send it

1523: Make updating nameban reason work r=def- a=12pm



Co-authored-by: def <dennis@felsin9.de>
Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
2019-03-19 23:08:37 +00:00
def 9ea9a43f13 Reset authed level in client
As reported by jao on Discord:

22:26 <jao> @Learath2 client auth level needs to reset on server join or something
22:28 <jao> because other servers don't send it
2019-03-19 22:29:41 +01:00