edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 12:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
8384 commits 1 branch 429 tags 411 MiB
Commit graph

8384 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dennis Felsing 47a99c7dab
Merge pull request #1038 from heinrich5991/pr_ddnet_cmake_revert 
Support older wavpack versions
 2018-02-17 20:16:04 +01:00
Dennis Felsing 80a55d7761
Merge pull request #1037 from heinrich5991/pr_ddnet_cmake_readme_dependencies 
Update README.md instructions for installing dependencies
 2018-02-17 06:46:53 +01:00
heinrich5991 73c03544b4 Support older wavpack versions 2018-02-17 01:35:07 +01:00
heinrich5991 dc9c7bd382 Revert "Fix bundled pnglite" 
This reverts commit e8402062bf.
 2018-02-17 01:31:46 +01:00
heinrich5991 99fe1d7bcf Revert "Fix bundled wavpack when system wavpack is available" 
This reverts commit 0d9265b1fa.
 2018-02-17 01:31:40 +01:00
heinrich5991 b07ca617a9 Update README.md instructions for installing dependencies 
This follows the recent change that glew, pnglite and wavpack can use
the system libraries now.
 2018-02-17 01:22:01 +01:00
def 0d9265b1fa Fix bundled wavpack when system wavpack is available 2018-02-15 19:30:40 +01:00
def e8402062bf Fix bundled pnglite 2018-02-15 19:25:43 +01:00
bors[bot] b14370e6ad Merge #1035 
1035: Fix #1031 r=heinrich5991 a=Learath2

Not sure if this is the best way to do this though :D
 2018-02-14 13:08:15 +00:00
Dennis Felsing 9ec8e16ec6
Merge pull request #1036 from heinrich5991/pr_ddnet_cmake_websockets 
Try to find `libwebsockets` on the host system
 2018-02-14 14:02:57 +01:00
heinrich5991 c2aaef2adf Remove vendored libwebsockets 2018-02-14 12:55:37 +01:00
heinrich5991 38b96791f6 Try to find libwebsockets on the host system 2018-02-14 12:55:37 +01:00
def e9bc42a63c Update websockets implementation (fixes #1022) 
seems to work with libwebsockets 2.4
 2018-02-14 12:30:14 +01:00
Learath2 ff872b39cd Forgot to add GameID to the col-list 2018-02-14 01:17:40 +01:00
Learath2 61f0461d46 Style 2018-02-13 17:15:16 +01:00
bors[bot] 6338a05fd3 Merge #1025 
1025: Add Teehistorian UUIDs to every record r=heinrich5991 a=Learath2

For statistic collecting purposes, don't merge before updating the SQL Schema.

    ALTER TABLE record_race ADD COLUMN GameID VARCHAR(64) AFTER cp25;
    ALTER TABLE record_teamrace ADD COLUMN GameID VARCHAR(64) AFTER ID;
 2018-02-13 16:01:20 +00:00
Learath2 8cfebaa0b2 Fix #1031 2018-02-13 03:45:43 +01:00
bors[bot] c0fa444f3a Merge #1034 
1034: Try to find external GLEW, pnglite and Wavpack  r=Learath2 a=heinrich5991

Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
 2018-02-13 02:02:07 +00:00
heinrich5991 94818ec1f0 Try to find external GLEW, pnglite and Wavpack 
Allow for newer versions of Wavpack, fixes #1023.

Fixes #1016.
 2018-02-12 23:29:45 +01:00
heinrich5991 22164d5c45 Squelch warnings in bundled ZLIB dependency 2018-02-12 23:29:45 +01:00
heinrich5991 797581502a Remove spurious engine/server include in game 2018-02-12 23:29:45 +01:00
heinrich5991 9e9b57ec62 Move generated files to the CMake build directory 2018-02-12 23:29:45 +01:00
def 5587e6dc96 Remove unused inp_grab 2018-02-11 16:40:08 +01:00
bors[bot] 6283ad2012 Merge #1015 
1015: Fix typo r=heinrich5991 a=yangfl
 2018-02-07 16:22:48 +00:00
Learath bc11fc2a35 Add GameUuid to teamscore aswell 
Also get GameUuid through an interface.
 2018-02-07 16:43:36 +01:00
Dennis Felsing f62833b699 Always keep same resolution on macosx 2018-02-07 13:21:18 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
Dennis Felsing 4c8a770ba6 macosx highdpi try #123456789 2018-02-07 08:22:57 +01:00
Learath 94d98e833a Fix mistakes. Fix CREATE TABLE 2018-02-07 01:10:02 +01:00
Learath 0aeb912db2 Escape the UUID just in case 2018-02-07 00:44:03 +01:00