Commit graph

5729 commits

Author SHA1 Message Date
necropotame 5ddf0a5421 Changes after heinrich5991's review of #586 - Fix some more comments 2017-03-16 16:41:58 +01:00
necropotame 9bae313929 Changes after heinrich5991's review of #586 - Code cleanup, Fix typo, Fix bug with Y clipping 2017-03-16 16:39:29 +01:00
heinrich5991 f7dde1e061 Partially revert #681
The refactoring can cause a gameplay change, laws of associativity like
`x * (1 / z) == (x * 1) / z` don't hold for floating point numbers.
2017-03-16 10:19:08 +01:00
Ryozuki d0c317d7c7 Fix a typo and refactor the normalize function 2017-03-16 07:55:49 +01:00
necropotame 4027b3dc01 Add error message in case of invalid argument for /timer 2017-03-15 12:22:13 +01:00
necropotame 6f58c49f7d Fix #586 (display the killing clipping rectangle) 2017-03-15 12:06:13 +01:00
necropotame e4345307c1 Fix #662 (timer command displays the wrong state) 2017-03-15 11:11:01 +01:00
Dennis Felsing 32a1fa0c07 Merge pull request #672 from Learath2/dd_pr_hearts
Forgot m_Friend isn't initialized, also align the messages
2017-03-13 12:04:47 +01:00
Learath2 3bd94b9ada Forgot m_Friend isn't initialized, also align the messages 2017-03-12 22:32:05 +01:00
heinrich5991 54c5faa64c Complete the refactor 2017-03-12 19:52:29 +01:00
Alexandre Díaz 3589ed0b0f Start refactor... 2017-03-12 19:30:55 +01:00
heinrich5991 ccb9db9899 Merge pull request #652 from Learath2/dd_pr_invite
Add /invite for locked teams. Fixes #647
2017-03-12 19:04:55 +01:00
Learath2 c81f53ab6b Forgot CID can be -1 2017-03-12 17:37:16 +01:00
heinrich5991 d91cca728d Partially revert warning-fixing, it caused warnings on other systems 2017-03-12 16:47:37 +01:00
heinrich5991 94e8e26f8d Merge pull request #664 from Learath2/dd_pr_friends2
Just color the heart preserving team information. Fixes #606
2017-03-12 15:18:04 +01:00
Ryozuki 84726547aa Fix warning also for server.cpp, and fixed client.cpp 2017-03-12 14:49:18 +01:00
Ryozuki 79f5b26cf7 Moved _WIN32_WINNT to the top instead 2017-03-12 14:45:57 +01:00
Ryozuki 1614e59e8f Fix some warnings 2017-03-12 12:12:39 +01:00
Learath2 9919173ceb Just color the heart preserving team information. Fixes #606 2017-03-10 18:49:39 +01:00
Learath2 0b0783f13c Fix styling issues, use uint for bitmask 2017-03-10 14:52:49 +01:00
Dennis Felsing 1d67e29c74 Merge pull request #663 from heinrich5991/pr_ddnet_fix_default_pws
Fix handling of default passwords
2017-03-10 12:45:01 +01:00
heinrich5991 87596c30ac Fix handling of default passwords
It was horribly broken before. :) Only the first password set via
`sv_rcon*_password` worked, and that only due to a bug in `AddHashKey`
-- `AddHashKey` incorrectly assumed that only key slots greater than 0
are valid, but 0 is valid too.

Fix default passwords on password removal, fix no admin password being
generated if you only had `sv_rcon_mod_password` or
`sv_rcon_helper_password` set. Add an assert that would have caught our
mistake.
2017-03-10 12:33:34 +01:00
heinrich5991 f2b2eb8639 Allow easier login for passwords with spaces 2017-03-10 12:30:41 +01:00
Dennis Felsing 4e39aea2f7 Version 10.4.3 2017-03-09 14:23:40 +01:00
heinrich5991 72f2eb32ee Fix wording in scripts/hash_passwords.py, fix brace in other file 2017-03-09 13:37:54 +01:00
Dennis Felsing 761c3c9be1 Merge pull request #646 from heinrich5991/pr_ddnet_brace_style
Fix the brace style in some places
2017-03-09 13:31:21 +01:00
heinrich5991 d98abf35db Rename WEBSOCKETS to CONF_WEBSOCKETS 2017-03-07 13:03:37 +01:00
heinrich5991 c201d7959c Enable -Wdeclaration-after-statement for compat with MSVC 2017-03-07 13:02:37 +01:00
heinrich5991 5b63a33095 Merge pull request #639 from Learath2/dd_pr_rconauth2
New auth system for rcon.
2017-03-06 20:57:42 +01:00
heinrich5991 6302e4d7e0 Fix some style issues and a > to >= 2017-03-06 20:11:23 +01:00
heinrich5991 e08ca70b1f Fix dummy input reset 2017-03-06 19:45:39 +01:00
Learath2 0d4499a027 Rename bind_print to dump_binds. 2017-03-06 18:06:55 +01:00
heinrich5991 c1e826e853 Fix key slot indices after removing a key 2017-03-06 18:02:19 +01:00
Learath2 759799953f Remove dump_binds. Let bind_print dump all. Fixes #634 2017-03-06 15:32:11 +01:00
Learath2 8c79f28802 Fix a crash on malformed input 2017-03-06 15:18:52 +01:00
Learath2 b49c13e617 KeySlots are 0 indexed... 2017-03-06 14:14:45 +01:00
Learath2 a87edad978 Move to a cpp file 2017-03-06 14:04:09 +01:00
Learath2 cbb5891263 Introduce ugly workaround to allow empty usernames 2017-03-06 13:49:08 +01:00
Learath2 71fb030443 Fix a comparison. Hate backwards compatibility... 2017-03-06 13:46:02 +01:00
Learath2 4d0f036b4f Forgot to negate the comparisons 2017-03-06 13:22:17 +01:00
Learath2 9800360340 Check the return from str_hex_decode. Remove comment 2017-03-06 12:59:47 +01:00
Learath2 3c6a21ace2 dbg_assert felt more appropriate 2017-03-06 12:58:49 +01:00
Learath2 c5a12e3eba Fix the status command for logged out people 2017-03-06 12:35:37 +01:00
Learath2 6f1f348715 Fix c&p fail 2017-03-06 12:35:09 +01:00
Learath2 939a7f0d3f This time actually add error checking to str_hex_decode 2017-03-06 12:33:29 +01:00
Learath2 9319a82c6e Add /invite for locked teams. Fixes #647 2017-03-06 12:14:38 +01:00
Learath2 4101acd747 Add rcon_login 2017-03-06 10:31:05 +01:00
Learath2 5317be824e Fix coloring of team chat. Fixes #648 2017-03-06 10:24:00 +01:00
def de7587b8b5 Version 10.4.2 2017-03-05 20:19:46 +01:00
Learath2 95bb9894a7 Get rid of pw generation in CServer, Err out in CAuthManager instead 2017-03-04 23:16:02 +03:00
Learath2 3a22a4b62d Fix some issues 2017-03-04 23:06:22 +03:00
Learath2 ed5824589c Make str_hex_decode a little more friendly 2017-03-04 23:06:07 +03:00
heinrich5991 ba5af42b1f Fix the brace style in some places 2017-03-04 15:43:49 +01:00
heinrich5991 a13cdc25b2 Merge pull request #632 from Learath2/dd_pr_friend
Put hearts before friends names. Closes #606
2017-03-04 15:37:24 +01:00
Learath2 cf9f3e3d38 Forgot one block 2017-03-04 10:58:02 +03:00
Learath2 d475eddb88 Add key ident to status command 2017-03-02 19:02:57 +03:00
Learath2 adfd6ca644 Enable the username prompt on client side 2017-03-02 18:16:50 +03:00
Learath2 b7cbaedea0 New auth system for rcon 2017-03-02 18:16:29 +03:00
necropotame 2c24fbce25 Fixed #636 2017-03-02 09:27:03 +01:00
Dennis Felsing 4c1053c6c4 Merge pull request #635 from heinrich5991/pr_dummy_input_demo_filter
Refactor dummy input and demo filtering
2017-03-01 07:59:24 +01:00
heinrich5991 b841fdc203 Bump version requirement for warmup race timer 2017-03-01 00:08:56 +01:00
heinrich5991 6517567e7e Merge pull request #602 from necropotame/gametick
Send the race time using warmup timer
2017-03-01 00:05:22 +01:00
heinrich5991 305a67d492 Initialize variable in the demo recorder 2017-02-28 17:16:22 +01:00
heinrich5991 e3f2316106 Revert "Revert "Refactor dummy input and demo filtering""
This reverts commit 187560c8c0.
2017-02-28 10:08:14 +01:00
Dennis Felsing 45c27e8b10 Version 10.4.1 2017-02-28 08:16:08 +01:00
Dennis Felsing 187560c8c0 Revert "Refactor dummy input and demo filtering"
This reverts commit 8375f4888e.
2017-02-28 08:15:35 +01:00
necropotame 6a9406dc81 Fixed merge conflict 2017-02-28 07:31:39 +01:00
necropotame b6548aa8cf Fix wrong code convension, add enum for timer display type 2017-02-28 07:31:24 +01:00
necropotame 4cfe96801b Send the race time using warmup timer 2017-02-28 07:31:24 +01:00
Learath2 7af41f6765 Actually use the color chosen 2017-02-28 01:23:10 +03:00
Learath2 fa22425f26 Add a checkbox to disable friend heart 2017-02-27 23:56:22 +03:00
Learath2 c783122301 Do not override the team color 2017-02-27 23:42:48 +03:00
Learath2 c76849c51a Add sliders for friend chat color 2017-02-27 23:39:06 +03:00
Learath2 3b2d707f31 Add a second page to HUD page 2017-02-27 23:38:24 +03:00
Learath2 cd1f337bf5 Put hearts before friends names. Closes #606 2017-02-27 22:38:08 +03:00
Dennis Felsing 16f04d8989 Version 10.4 2017-02-27 16:33:10 +01:00
Dennis Felsing eb36f421c5 Merge pull request #630 from heinrich5991/pr_ddnet_cmake_basic
Add overly simple CMakeLists.txt
2017-02-27 16:28:19 +01:00
heinrich5991 8375f4888e Refactor dummy input and demo filtering
Remove references to src/game/ from src/engine/
2017-02-23 14:13:14 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03:00
heinrich5991 1a103081b8 Merge pull request #623 from Ryozuki/pr_ctrl_backspace_fix
ctrl + backspace support on chat (Fixes ddnet#515)
2017-02-18 10:41:42 +01:00
Ryozuki 9af59fe8f3 tiny style changes 2017-02-18 09:02:29 +01:00
heinrich5991 0f50356e2d Merge pull request #624 from Redix/pr_stats
Statboard fix
2017-02-18 02:36:33 +01:00
Redix abcb074dcc Fixed statboard
- FPM value
- reset when a player leaves
2017-02-15 16:43:45 +01:00
Ryozuki 141a256cb3 Delete useless brackets 2017-02-14 17:06:51 +01:00
Ryozuki ec957fc00e ctrl + backspace support on chat (Fixes ddnet#515) 2017-02-14 17:00:50 +01:00
Learath2 9cd5fa53e5 Fix horrible indent. 2017-02-09 13:01:19 +01:00
heinrich5991 67062d8d84 Merge pull request #613 from marcelherd/feature/printbind
New command bind_print
2017-02-02 14:32:03 +01:00
east 0acad1a28b dnsbl fix: HostLookup check result properly 2017-02-01 12:13:50 +01:00
Marcel Herd 7737129ed6 Fixed code style 2017-01-28 18:34:24 +01:00
Marcel Herd b09bcb90a3 Added check for unbound key 2017-01-28 17:02:39 +01:00
Marcel Herd 1f58595033 Added command bind_print 2017-01-28 16:29:03 +01:00
def 1f636fe875 Fix team for echo 2017-01-06 00:30:21 +01:00
def 224b9d5443 echo command for clients prints to chat instead of mostly useless console 2017-01-06 00:17:53 +01:00
Dennis Felsing fd7561f869 Merge pull request #604 from necropotame/clipfix
Skip clipped groups that are outside the screen
2017-01-05 18:11:40 +01:00
necropotame b9e7728e2e Skip clipped groups that are outside the screen 2017-01-05 10:24:52 +01:00
heinrich5991 b42a59f290 Fix a crash with semicolon handling and timeout codes
Timeout codes lead to deallocation of the player structure, the
semicolon code tried to access it, resulting in a segmentation fault.
2017-01-04 18:14:08 +01:00
heinrich5991 80ea4c8590 Disallow usage of semicolons in chat commands
This prevents player name exploits due to tab completion of nicknames
that could result in unwanted commands being executed.

Print a deprecation message that is supposed to be removed in the
future.
2017-01-03 14:01:51 +01:00
heinrich5991 e94c0260d7 Implement /rules in a less copy-and-pasty way 2017-01-03 13:57:22 +01:00
Dennis Felsing 57c04cf988 Version 10.3.5 2016-12-16 15:56:22 +01:00
Dennis Felsing 7296dd2b53 Merge pull request #590 from Redix/pr_finish_buffer
Fix buffer overflow in race recorder and ghost
2016-12-16 15:54:02 +01:00