Commit graph

20744 commits

Author SHA1 Message Date
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
Learath 4a52bca55d Include the teehistorian uuid instead 2018-02-07 00:35:21 +01:00
def 864ff1ac74 Remove highdpi stuff
This reverts commit d234c55dfa.
2018-02-06 23:21:17 +01:00
Learath 4748d5f065 Add client version to the record 2018-02-06 20:07:42 +01:00
Dennis Felsing d234c55dfa Try macosx highdpi fix 2018-02-05 14:37:26 +01:00
Dennis Felsing ee117df043
Merge pull request #1017 from heinrich5991/pr_gitignore_cmake_builds
Organize .gitignore and also ignore build dir stuff
2018-02-05 08:03:20 +01:00
heinrich5991 22bacc1e16 Organize .gitignore and also ignore build dir stuff
Sort the stuff alphabetically, add some comments, ignore stuff that can
appear in build directories, so we don't have to guess the build
directory's name.
2018-02-05 00:50:55 +01:00
Tim Schumacher 861f234ea7 Add /build/ to .gitignore 2018-02-04 19:05:02 +00:00
Dennis Felsing 1782c09b32
Merge pull request #1014 from QingGo/patch-1
Change the wrong translation of Chinese
2018-02-04 12:42:36 +01:00
清歌 360e475d74
Change the wrong translation of Chinese
Countries should mean “国家” but not "次数"。
2018-02-04 19:03:53 +08:00
def a00d4112a7 Version 11.0.3 2018-02-03 21:47:09 +01:00
def c73e2a7ba8 New year is on January 1, not February 1 2018-02-01 20:22:18 +01:00
heinrich5991 5bf6f6db3c Remove bam instructions from README.md 2018-01-30 12:32:32 +01:00
bors[bot] 4b84d7558f Merge #1007
1007: Record rcon authentication stuff into teehistorian r=Learath2 a=heinrich5991

This allows to check moderator actions after-the-fact.
2018-01-30 10:38:01 +00:00
Dennis Felsing efe053033b Remove make_src.py 2018-01-29 14:38:42 +01:00
Dennis Felsing 46bb8fed65 Clean up .gitignore a bit 2018-01-29 14:37:31 +01:00
bors[bot] 250dd81e2e Merge #1009
1009: Scrub more references to bam r=heinrich5991 a=Learath2
2018-01-29 13:23:02 +00:00
bors[bot] 6b77d55743 Merge #1006
1006:  Remove `CPlayer::m_Authed`  r=Learath2 a=heinrich5991

This can't get out of sync now.
2018-01-29 12:43:30 +00:00
Learath2 050a34295f Remove make_release, scrub references to lua files 2018-01-29 13:37:26 +01:00
Learath2 98209fb0f4 Remove bam compatibility symlinks for osx 2018-01-28 22:53:51 +01:00
Learath2 b26eeb235d Scrub more references to bam 2018-01-28 22:47:03 +01:00
Learath2 71d82b26a9 Really remove bam 2018-01-28 14:34:35 +01:00
Learath2 b5d919f46b Remove bam 2018-01-28 14:18:10 +01:00
heinrich5991 1c3dc8c316 Record rcon authentication stuff into teehistorian
This allows to check moderator actions after-the-fact.
2018-01-28 03:13:05 +01:00
heinrich5991 a744fe53a2 Remove CPlayer::m_Authed
This can't get out of sync now.
2018-01-27 23:13:17 +01:00
heinrich5991 9fd7a7d283 Fix README.md Markdown format 2018-01-27 23:07:22 +01:00
bors[bot] f48a2a395b Merge #947
947: Add support for extra chunks in teehistorian r=Learath2 a=heinrich5991

This allows to add rarely-used chunks without increasing the file format
version.
2018-01-27 21:09:43 +00:00
def 4377c5d707 comma 2018-01-27 10:54:24 +01:00
def 3672efb6fe Can't change GAME_VERSION after all 2018-01-26 22:12:12 +01:00
def 151da9af97 Remove Emojis 2018-01-25 20:03:18 +01:00
Ryozuki 214a8ba10a fix votes 2018-01-25 19:36:40 +01:00
Dennis Felsing cb0209d6e3 Reapply "Only make grenades explode once (fix by timakro)" 2018-01-25 02:32:34 +01:00
Dennis Felsing f3256f0b6c Revert "Only make grenades explode once (fix by timakro)"
This reverts commit b9a93a18fb.
2018-01-24 07:50:15 +01:00
def dd7281ef86 Limit m_NumTimelineMarkers (reported by GG Kid) 2018-01-23 16:04:24 +01:00
def 39cb6ad8b7 Version 11.0.2 2018-01-22 20:55:24 +01:00
Tim Schumacher b3f7864ecf Don't change map release time when updating map stars/points 2018-01-22 20:47:26 +01:00
Dennis Felsing fac054275c
Merge pull request #992 from Jupeyy/master
RAM usage reduction for map buffering and foreground layer count fix
2018-01-22 20:44:56 +01:00
Dennis Felsing 8f2ce84f4e
Merge pull request #996 from Ryozuki/pr_cmd_vote_no
Add vote_no command
2018-01-22 20:36:20 +01:00
Dennis Felsing ce2fddfa76
Merge pull request #1002 from heinrich5991/pr_cmake_check_flags
CMakeLists.txt: Check for each of the flags before adding them
2018-01-22 20:32:47 +01:00
heinrich5991 9712a4494b CMAKE_CXX_FLAGS is space-separated, not semicolon-separated 2018-01-22 19:48:17 +01:00
heinrich5991 ccad91a11d Check for -std=gnu++11 in the C++, not C, compiler 2018-01-22 19:32:30 +01:00