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

10164 commits

This branch
This branch
All branches
Author SHA1 Message Date
bors[bot] 9e832174c5 Merge #1069 
1069: Ignore another file generated in build directories r=Learath2 a=heinrich5991
 2018-03-06 23:04:13 +00:00
heinrich5991 d118fbd5e0 Fix build with -DCLIENT=OFF on macOS 2018-03-06 19:25:59 +01:00
heinrich5991 b138f5450e Ignore another file generated in build directories 2018-03-06 19:22:56 +01:00
bors[bot] 731c329c13 Merge #1066 
1066: Remove teamkill message on solo teams r=heinrich5991 a=ChillerDragon

For speedrunning alone in a team this "Everyone in your locked team was killed because '%s' %s."
is very annoying. So better only print it if more than 1 tee is in the team.
 2018-03-06 13:14:18 +00:00
ChillerDragon 57cb136c55 Remove teamkill message on solo teams 
For speedrunning alone in a team this "Everyone in your locked team was killed because '%s' %s."
is very annoying. So better only print it if more than 1 tee is in the team.
 2018-03-06 14:08:04 +01:00
bors[bot] eef5131b0d Merge #1065 
1065: Proper negative top5 calculation (fixes #1064) r=heinrich5991 a=def-
 2018-03-05 11:00:57 +00:00
Dennis Felsing 93f0cd8933 Proper negative top5 calculation (fixes #1064) 2018-03-05 11:53:55 +01:00
bors[bot] fb69fa1815 Merge #1042 
1042: Allow specifying DATA_DIR by compiler option r=heinrich5991 a=yangfl
 2018-03-05 10:50:38 +00:00
bors[bot] 6303b11799 Merge #1062 
1062: Ignore Build and Release r=heinrich5991 a=ChillerDragon

Thanks to heinrich5991
 2018-03-04 10:24:09 +00:00
ChillerDragon b69b85ed54 Ignore Build and Release 2018-03-04 11:18:46 +01:00
bors[bot] e64919ddcb Merge #1058 
1058: Add /pausevoted and /specvoted r=heinrich5991 a=def-

- Also fix /pause and /spec with name parameter a bit
- Move out common code between pause/spec
 2018-03-02 14:41:31 +00:00
heinrich5991 458804c059 Make game dependency on generated protocol.h explicit 2018-03-02 03:42:35 +01:00
heinrich5991 565f963a7b Properly hide stderr in scripts/git_revision.py 2018-03-02 03:31:45 +01:00
Jupeyy ced0ea3f82 set the gfx refresh rate limit higher for the console 2018-03-02 03:29:02 +01:00
heinrich5991 b285d777f3 Python 2 support for scripts/git_revision.py on error /o\ 2018-03-02 03:22:44 +01:00
Jupeyy cc7371c1cd set upper limit, for the case, if the refreshrate is smaller than the gameticks 2018-03-02 03:12:30 +01:00
Dennis Felsing fca81553ba
Merge pull request #1056 from heinrich5991/pr_ddnet_cmake_regenerate_version 
Regenerate version file on git changes
 2018-03-01 22:01:13 +01:00
def ad99c58528 Add /pausevoted and /specvoted 
- Also fix /pause and /spec with name parameter a bit
- Move out common code between pause/spec
 2018-03-01 19:46:07 +01:00
heinrich5991 1387ee9a3a Regenerate version file on git changes 
Previously, this file had to be manually deleted if you wanted to have a
new version compiled in.
 2018-03-01 16:50:29 +01:00
Jupeyy 089cb1ea44 this must be inactive ofc 2018-03-01 08:25:34 +01:00
Jupeyy a808ee07d3 add accedentially removed cast 2018-03-01 08:07:48 +01:00
Jupeyy 3458ee0976 check if gfx_refresh_rate is non zero 2018-03-01 07:50:52 +01:00
Jupeyy 6f0509cfae the actual description to the problem 2018-03-01 07:44:22 +01:00
Jupeyy edaf632c04 Merge branch 'master' of https://github.com/ddnet/ddnet 2018-03-01 07:38:50 +01:00
Jupeyy 238c8847c0 keep track of lost frames and updates, to ensure FPS stability and 
better CPU sleep times
 2018-03-01 07:34:14 +01:00
Jupeyy 3dabb5c2bd ensure right internal image format, to prevent unsupported reformatting 2018-03-01 07:31:09 +01:00
bors[bot] 5890c4e72e Merge #1054 
1054: removed unused teams function r=heinrich5991 a=ChillerDragon
 2018-02-27 15:45:36 +00:00
ChillerDragon c1e3dec980 Remove unused teams function 2018-02-27 16:40:52 +01:00
bors[bot] 10b60008cc Merge #1053 
1053: Don't log out on `sv_rcon{,_mod,_helper}_password` if not changed r=Learath2 a=heinrich5991
 2018-02-26 17:59:00 +00:00
heinrich5991 61c7e9307d Don't log out on sv_rcon{,_mod,_helper}_password if not changed 2018-02-26 18:01:02 +01:00
Dennis Felsing de3f4daf0d
Merge pull request #1051 from ddnet/dd_pr_langui 
Fix UI break on portuguese
 2018-02-22 22:20:46 +01:00
Emir Marincic 4264652573
Fix UI break on portuguese 
This very badly overflows, just "Information" should work fine in this context.
 2018-02-22 22:03:20 +01:00
Dennis Felsing 03792c1d0f
Merge pull request #1047 from Learath2/dd_pr_ctrldelete 
Add ctrl-delete to chat. Closes #1032
 2018-02-22 21:58:51 +01:00
Dennis Felsing 4cebe86ad8
Merge pull request #1049 from Learath2/dd_pr_scoreboardclan 
A little more space for clan name. Fixes #724
 2018-02-22 21:58:10 +01:00
Learath 7d1aaa735a A little more space for clan name. Fixes #724 2018-02-22 21:17:10 +01:00
Learath 4031e15fc8 Remove extra conditional 
Stricter scope on temporary var.
 2018-02-22 20:48:47 +01:00
Dennis Felsing 9428b2771e
Merge pull request #1048 from Learath2/dd_pr_dyncamtoggle 
Fix dyncam confusion. Closes #783
 2018-02-22 20:43:07 +01:00
Learath 20cac1c2bb Fix dyncam confusion. Closes #783 
Remove "vanilla" dyncam toggle.
 2018-02-22 20:40:14 +01:00
Learath 1f2e398819 Add ctrl-delete to chat. Closes #1032 2018-02-22 20:11:56 +01:00
yangfl 3c488ff5c7 Allow specifying DATA_DIR by compiler option 2018-02-22 00:12:52 +08:00
Dennis Felsing 6c41e95f25
Merge pull request #1045 from heinrich5991/pr_ddnet_cmake_improvements 
Some CMake improvements
 2018-02-21 07:38:46 +01:00
Dennis Felsing ca75ab3ff5
Merge pull request #1044 from heinrich5991/pr_ddnet_gitignore_specific 
Remove the blanket rules for files without extension
 2018-02-21 07:38:28 +01:00
heinrich5991 2d55136fa2 Remove the blanket rules for files without extension 
This rule caused a couple of problems with Visual Studio.
 2018-02-21 00:36:19 +01:00
heinrich5991 1578e272a3 Ignore old generated files if still present 
Our build system used to put generated files into `src/game/generated`,
now it's using `${PROJECT_BUILD_DIR}/src/game/generated`. Prefer the
ones in `${PROJECT_BUILD_DIR}/src/game/generated`.
 2018-02-20 17:11:18 +01:00
heinrich5991 ac7e92df5e Rerun wavpack version detection when the library changes 2018-02-20 17:10:52 +01:00
Dennis Felsing c1ae989f6a
Merge pull request #1043 from heinrich5991/pr_ddnet_fix_system_wavpack 
Fix crash on startup due to sound initialization
 2018-02-18 15:35:42 +01:00
def 491ccc85e1 Revert "Fix system wavpack (fixes #1041)" 
This reverts commit 295b8a663a.
 2018-02-18 15:35:20 +01:00
heinrich5991 f7b7054152 Fix crash on startup due to sound initialization 
Of course `WavpackOpenFileInputEx` is subtly incompatible to
`WavpackOpenFileInputEx64` in that it requires the userdata for the main
steam to be nonnull.

Fixes #1041.
 2018-02-18 12:45:03 +01:00
def 295b8a663a Fix system wavpack (fixes #1041) 2018-02-18 09:36:35 +01:00
heinrich5991 ca22f08dc4 Remove superfluous set(*_FOUND ON) 
This is already set by `find_package_handle_standard_args`.
 2018-02-18 02:30:05 +01:00