Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #41

Merged
merged 511 commits into from
Jan 7, 2020
Merged

Dev #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
511 commits
Select commit Hold shift + click to select a range
2c492f2
Merge pull request #2292 from ChillerDragon/pr_editor_layer_size
oy Nov 23, 2019
7ebd612
Change browser default sort criterion to descending player count
Dune-jr Nov 27, 2019
489baf2
Fix typo 'handle'
ChillerDragon Nov 28, 2019
5f75806
Add str_startswith_nocase and str_endswith_nocase
ChillerDragon Nov 28, 2019
7214209
'str_comp_nocase_num' -> 'str_startswith_nocase'
ChillerDragon Nov 29, 2019
62982e9
Add server-side command support
Nov 29, 2019
8813214
Remove empty lines
Nov 29, 2019
2538f24
Missing parents
Nov 29, 2019
5e03df0
Limit command amount
Nov 29, 2019
d291e9d
Style fixes
Nov 29, 2019
9fdf5bb
No parameters on /team
Nov 29, 2019
1b7ea8b
Fixed wrong variable name
Nov 30, 2019
f3d9a25
Clean up scoreboard code a bit
axblk Nov 30, 2019
e6e3087
Fix statboard not showing all players
axblk Oct 23, 2019
a9eeaed
Always highlight the own entry in statboard
axblk Nov 30, 2019
e785cdf
Merge pull request #2295 from ChillerDragon/pr_typo_handle
oy Dec 6, 2019
598dc9f
Merge pull request #2296 from ChillerDragon/pr_starts_ends_nocase
oy Dec 6, 2019
e4ac666
Merge pull request #2301 from Dune-jr/task-changebrowserdef
oy Dec 6, 2019
eb79b4b
expand the 'All' filter tab by default
oy Dec 6, 2019
0c89a8b
Merge pull request #2 from teeworlds/master
Zatline Dec 7, 2019
e679a82
Merge pull request #2299 from axblk/fix/statboard
oy Dec 7, 2019
b9db1f1
fixed arrow handling in the demo browser #2253
oy Dec 7, 2019
af25e7a
Call secure_random_init in tool servers
def- Dec 8, 2019
64d5d32
Change settings naming scheme to show major version, include minor ve…
Dune-jr Dec 8, 2019
e27085a
Merge pull request #2302 from def-/pr-tools_secure_random_init
oy Dec 8, 2019
852bd8c
Add helper annotation when whispering
Dune-jr Dec 8, 2019
3f1b43f
Fix chat rendering
axblk Oct 30, 2019
6b8ada5
Fix cmake build routine for nethash
Dune-jr Dec 8, 2019
76a76e1
Merge pull request #2303 from Dune-jr/task-annotate-settings
oy Dec 8, 2019
bb391c0
Make the whisper helper text grey
Dune-jr Dec 8, 2019
c255f83
Merge pull request #2304 from Dune-jr/task-annotate-whisper
oy Dec 8, 2019
9e0e700
Remove unused code
axblk Dec 8, 2019
cf63f02
Merge pull request #2306 from axblk/fix/chat
oy Dec 8, 2019
d4c3b11
Extend network protocol for basic race features
axblk Dec 9, 2019
3e186b5
Show times in the serverbrowser
axblk Dec 9, 2019
b743193
Replace kill messages with time messages in race gamemodes
axblk Sep 4, 2019
eee1e8f
Add more race features
axblk Dec 8, 2019
eccf470
Add minimal client version for race features
axblk Sep 5, 2019
22b3dba
Fix snapshot delta for new items
axblk Sep 6, 2019
fd555a2
Merge kill and finish messages
axblk Dec 8, 2019
d217838
Add localized chat message for new race records
axblk Dec 9, 2019
cd12115
Race: add possibility to hide kill messages
axblk Dec 9, 2019
374957c
Race: add possibility to print finishes in chat
axblk Dec 9, 2019
dc7d595
Fix /usr/bin/env path
Dec 9, 2019
a3774fb
Removed color header
LordSk Dec 9, 2019
1381a2b
Filter out GAMEFLAG_RACE for unsupported clients
axblk Dec 9, 2019
adfde95
Clean up race precision handling
axblk Dec 9, 2019
6774be0
Add race score hud
axblk Dec 9, 2019
2f06208
Merge pull request #2308 from def-/pr-env-path
oy Dec 9, 2019
85d5146
Merge pull request #2309 from LordSk/fix_ui_makings
oy Dec 9, 2019
6d30262
fixed multiple listbox behavior in settings->general
oy Dec 9, 2019
47f87fc
Prevent buffer overflow in the snapshot builder
axblk Dec 9, 2019
23a06f4
Fix snapshot handling for demos
axblk Dec 9, 2019
d7950c9
add color-able dark and white eyes
Zatline Dec 11, 2019
a4c71dc
Create _colorconvert
Zatline Dec 11, 2019
66189c5
Delete _colorconvert
Zatline Dec 11, 2019
66195af
Add new decoration parts
Zatline Dec 11, 2019
ca86e38
Add more than 32 new marking/ painting parts
Zatline Dec 11, 2019
0f35e24
Add 12 new body types
Zatline Dec 11, 2019
98d74d6
Add toggle dynamic camera to controls
ChillerDragon Dec 12, 2019
5319f23
Merge pull request #2310 from axblk/fix/snap
oy Dec 13, 2019
e9d5efe
Add 24 new skins
Zatline Dec 13, 2019
4f422f1
Add new skins to cmake
ChillerDragon Dec 13, 2019
282892e
Fix regression
Learath2 Dec 13, 2019
a481f3d
Add race flag for keeping the wanted weapon on death
axblk Dec 13, 2019
38310aa
Add timer clock icon by Sonix
axblk Dec 13, 2019
657df82
Improve race hud a bit
axblk Dec 13, 2019
b9b3524
Some more race ui tweaks
axblk Dec 13, 2019
d6c7ce7
Update beaver.json
Zatline Dec 13, 2019
257fc09
Update bumbler.json
Zatline Dec 13, 2019
7aa38fa
Merge pull request #3 from ChillerLine/pr_fix_skin_cmake
Zatline Dec 13, 2019
3301578
Update cavebat.json
Zatline Dec 13, 2019
e0ae4a5
Update force.json
Zatline Dec 13, 2019
724501a
Update fox.json
Zatline Dec 13, 2019
a11bcd7
Update greycoon.json
Zatline Dec 13, 2019
c61f732
Update greyfox.json
Zatline Dec 13, 2019
debf7a3
Update hippo.json
Zatline Dec 13, 2019
adb5f90
Update limedog.json
Zatline Dec 13, 2019
104aa25
Update pandabear.json
Zatline Dec 13, 2019
096bb53
Update panther.json
Zatline Dec 13, 2019
d6d74e5
Update pento.json
Zatline Dec 13, 2019
467ddcf
Update piggy.json
Zatline Dec 13, 2019
f98f0fe
Update warmouse.json
Zatline Dec 13, 2019
4dff645
Update tooxy.json
Zatline Dec 13, 2019
254d1c7
Update tiger.json
Zatline Dec 13, 2019
04b2f68
Update raccoon.json
Zatline Dec 13, 2019
b8a2afa
Update greycoon.json
Zatline Dec 13, 2019
b80a763
Update setisu.json
Zatline Dec 13, 2019
8cdd0da
Merge pull request #2307 from axblk/feature/race
oy Dec 14, 2019
92caff4
Merge branch 'master' into master
oy Dec 14, 2019
127f8fb
Merge pull request #2315 from Zatline/master
oy Dec 14, 2019
a09845d
fixed some typos
oy Dec 14, 2019
ed6c81a
fixed shift op
oy Dec 14, 2019
8183302
Merge pull request #2273 from Learath2/pr_md5_openssl
oy Dec 14, 2019
cf31b4c
fixed more problems with list boxes
oy Dec 14, 2019
ae34f45
fixed a warning
oy Dec 14, 2019
d74776f
Add a simple winter menu theme
Sonix- Dec 15, 2019
d6abbe3
Merge pull request #2321 from Dune-jr/winter_theme
oy Dec 15, 2019
cc0c6c0
changed default menu theme to winter
oy Dec 15, 2019
4525fa6
fixed localisation
oy Dec 15, 2019
3aeffa3
Merge pull request #2314 from ChillerDragon/pr_toggle_dyncam
oy Dec 15, 2019
5b7b880
fixed vote option index when using the search. closes #2313
oy Dec 15, 2019
ed06ec3
remove unused search bar for vote player/spec
oy Dec 15, 2019
9f0f66f
show number of alive players in lms. closes #2298
oy Dec 15, 2019
5a5e92b
Remove unnecessary Localize of X/Y axis
Dune-jr Dec 15, 2019
65c1d46
Merge pull request #2322 from Dune-jr/fix-uselesslocale
oy Dec 15, 2019
8b650a8
RgbToLab, LabDistance, Adjust eye color based on body color <-> eye c…
LordSk Dec 17, 2019
c1f77b9
More accurate breaking point
LordSk Dec 17, 2019
9ba365f
Restored commented out code (woops)
LordSk Dec 17, 2019
a26b41d
Introduce cl_last_version_played, use it for enforcing winter theme o…
Dune-jr Dec 17, 2019
e1567f1
Merge branch 'master' into pr_serverside_cmds
Dec 18, 2019
532c626
Fix style of network.py
Dec 18, 2019
689db62
Moved validation to client side
LordSk Dec 18, 2019
4288de7
Add ability to remove commands, make arrays fixed size.
Dec 18, 2019
1caca5f
Show subcommand argument in commands list
Dec 18, 2019
3fc90b1
NULL -> 0
Dec 18, 2019
383cab2
Reset chat commands always
Dec 18, 2019
d449825
Remove command debug code
Dec 18, 2019
aa0d2ef
Show correct preview in the settings menu, and made a few adjustments
LordSk Dec 18, 2019
540a49d
Renamed define and undef it
LordSk Dec 18, 2019
12e59dc
Fixed warning
LordSk Dec 18, 2019
d226f03
Fix ClLastVersionPlayed check
Dune-jr Dec 18, 2019
33142d4
Fixed more warnings
LordSk Dec 18, 2019
02a0476
Adjust the buttons for the ingame browser to be more consistent
Dune-jr Dec 19, 2019
db8f831
Merge pull request #2327 from Dune-jr/task-browser-headers
oy Dec 20, 2019
cbb5776
Update CMakeLists.txt
oy Dec 20, 2019
a461407
Fix handling of strings with context in `scripts/convert_l10n.py`
heinrich5991 Dec 21, 2019
7e7b136
Merge pull request #2329 from heinrich5991/pr_l10n_fix_convert
oy Dec 21, 2019
be770ee
fixed default and max value for cl_last_version_played
oy Dec 21, 2019
589e88a
Merge pull request #2326 from Dune-jr/task-defaultwinter3
oy Dec 21, 2019
3c5d671
Merge pull request #2325 from LordSk/feature-eyes
oy Dec 21, 2019
0992498
fixed a top left corner of the ingame server browser
oy Dec 21, 2019
13fcb69
Improve the way sprees and captures are displayed, replace Frags/Deat…
Dune-jr Dec 8, 2019
4c80618
changed the colour of the race finish info message
oy Dec 21, 2019
c1bb728
Print SDL version
LordSk Dec 21, 2019
2d76e59
Merge pull request #2330 from LordSk/feature_sdl_version
oy Dec 21, 2019
22541c3
Replace the browser button by a globe icon, fix shadows
Dune-jr Dec 21, 2019
dba7704
Replace "Settings" by the settings icon
Dune-jr Dec 21, 2019
d2806e7
Weapon bars
Dune-jr Dec 20, 2019
14b580d
Fix the spree/best spree overlapping problem with FPM
Dune-jr Dec 21, 2019
caa5601
Fix pixelization of weapon bars due to too high RoundSize
Dune-jr Dec 21, 2019
da1c810
Automerge Frags and Deaths if they are selected
Dune-jr Dec 21, 2019
c3621a7
Add missing float qualifiers to constants
Dune-jr Dec 21, 2019
9a346e9
added race icon by Sonix-. closes #2316
oy Dec 22, 2019
cfe4492
Lowercase race icon and add to cmake
ChillerDragon Dec 22, 2019
f9e3969
Merge pull request #2334 from ChillerDragon/pr_cmake_race
oy Dec 22, 2019
9a738b8
Lower case RACE.png
ChillerDragon Dec 22, 2019
89cbbf9
Add extended browser UI view
Dune-jr Dec 14, 2019
e6bbc2e
Remove wide UI test button
Dune-jr Dec 22, 2019
ac8efeb
Use the same family of UTF-8 icons for the square and the rectangle (…
Dune-jr Dec 22, 2019
6d0782a
Update browser icon to make it pretty on hover
Dune-jr Dec 22, 2019
c373980
Revert "Replace "Settings" by the settings icon"
Dune-jr Dec 22, 2019
18d8278
Readjust ingame menus buttons positions
Dune-jr Dec 22, 2019
c6fe110
Merge pull request #2331 from Dune-jr/exp-browser-icon
oy Dec 22, 2019
9329fba
Merge pull request #2335 from ChillerDragon/pr_lower_race
oy Dec 22, 2019
8285f19
Merge pull request #2297 from Ryozuki/pr_serverside_cmds
oy Dec 22, 2019
5bee8fb
Fix some braces style
Dune-jr Dec 22, 2019
a8e5b29
Merge pull request #2336 from Dune-jr/fix-braces
oy Dec 22, 2019
fd97717
updated languages submodule
oy Dec 22, 2019
ad31d63
Fix issue where contextualized string would erase non-contextualized …
Dune-jr Dec 22, 2019
1ff096e
Merge pull request #2337 from Dune-jr/fix-locale-lostcontext
oy Dec 22, 2019
ee8c31f
Restrict the wide UI button
Dune-jr Dec 22, 2019
8ee2bac
Merge pull request #2319 from Dune-jr/exp-extendedbrowser
oy Dec 22, 2019
3604a62
update language submodule
oy Dec 22, 2019
959a5e4
Merge branch 'master' of https://github.com/teeworlds/teeworlds
oy Dec 22, 2019
756215f
Merge pull request #2305 from Dune-jr/task-improve-statboard
oy Dec 22, 2019
74a824b
updated language submodule
oy Dec 22, 2019
6561d49
made 0.7.4 release
oy Dec 22, 2019
30769f0
Dim statboard weapon colors
Dune-jr Dec 22, 2019
84b9eff
Merge pull request #2338 from Dune-jr/task-dim-statboardcolors
oy Dec 22, 2019
0103d0b
Fix statboard header size when flag grabs + not a team mode
Dune-jr Dec 22, 2019
8dc1de7
Merge pull request #2340 from Dune-jr/fix-statboard-headersize
oy Dec 22, 2019
a51c00a
Change statboard header font size
Dune-jr Dec 22, 2019
5bce424
Merge pull request #2341 from Dune-jr/fix-statboard-headerfont
oy Dec 22, 2019
1ec8f16
Don't render statboard if menus is active
Dune-jr Dec 23, 2019
ded5a0e
Extra margin for large K:D and prevent weapons stats overflowing in n…
Dune-jr Dec 23, 2019
28f9da3
Merge pull request #2343 from Dune-jr/fix-statboard
oy Dec 23, 2019
da2c087
Allow scores up to 9999
fokkonaut Dec 23, 2019
d646fa7
fixed ingame server browser tabs. closes #2346
oy Dec 27, 2019
0ba0633
fixed some style issues and an index check
oy Dec 27, 2019
0a1f328
cleaned up some memory usage
oy Dec 27, 2019
e8b9ff3
fixed issue with removing a chat command
oy Dec 27, 2019
031177b
Merge pull request #2344 from fokkonaut/pr-clamp-score
oy Dec 27, 2019
623cb47
close chat after executing server/friend/mute chat command. closes #2350
oy Dec 28, 2019
a7226cc
fixed usage of the initial text when using chat commands
oy Dec 28, 2019
80b0f35
turn off black chat window after executing server/friend/mute chat co…
oy Dec 30, 2019
eaf57aa
use tab to auto complete selected chat command. closes #2354
oy Dec 30, 2019
fb19449
fixed icon for the ingame server browser tab. closes #2353
oy Dec 30, 2019
2cc567f
use the correct server browser type/tab when opening the ingame browser
oy Dec 30, 2019
2dcadc3
fixed tab completion for nicks when a command is selected
oy Dec 30, 2019
06e4b38
Show vote calls in server logs
ChillerDragon Jan 2, 2020
f83b1c5
Add gun and hammer pickups again (closes #2358)
fokkonaut Jan 2, 2020
9c2a362
show name in 'remove friend' popup (fixes #2348)
Robyt3 Jan 3, 2020
cb77418
Fix mouse reset while spectatorinfo is on
fokkonaut Jan 4, 2020
ab89179
Add example command server-side (closes #2347)
fokkonaut Jan 4, 2020
0b7644c
add separate confirmation message when removing clan
Robyt3 Jan 4, 2020
cfa1c3a
make scrollbar handle size relative to slider to support small sizes
Robyt3 Jan 4, 2020
3d9acbc
replace max. ping editbox with scrollbar option
Robyt3 Jan 4, 2020
2a19c15
Merge pull request #2357 from ChillerDragon/pr_log_votes
oy Jan 4, 2020
d8f475c
Merge pull request #2363 from fokkonaut/pr-command-example
oy Jan 4, 2020
329cddf
move check outside of Localize call
Robyt3 Jan 4, 2020
056688d
Merge pull request #2360 from Robyt3/issue2348
oy Jan 4, 2020
5ba5e0c
Fix tees being stuck in each other (closes #1261)
fokkonaut Jan 4, 2020
b788009
Merge pull request #2364 from fokkonaut/pr-fix-tee-stuck
oy Jan 4, 2020
29e7ed1
limit relative scrollbar handle size to original value
Robyt3 Jan 4, 2020
e464f0e
Merge pull request #2359 from fokkonaut/pr-missing-pickups
oy Jan 4, 2020
0ad03e6
Simplify anti tee stuck
fokkonaut Jan 5, 2020
04dc76a
Merge pull request #2366 from fokkonaut/pr-fix-tee-stuck
oy Jan 5, 2020
595cc50
Merge pull request #2361 from fokkonaut/pr-fix-mouse-issue
oy Jan 5, 2020
b85e8c3
don't show dead players in spectator selector
oy Jan 5, 2020
38a3e7a
fix issues in DoScrollbarOption, minor restructuring
Robyt3 Jan 5, 2020
5f02b1a
show label above max ping scrollbar option
Robyt3 Jan 5, 2020
f567512
Merge pull request #2365 from Robyt3/issue2267
oy Jan 5, 2020
cc2be45
Properly display hdiutil status in CMake
heinrich5991 Jan 5, 2020
e036ee2
Merge pull request #2367 from heinrich5991/pr_cmake_fixhdiutilstatus
oy Jan 5, 2020
ae32d4f
add server level enum and methods with validation, closes #2274
Robyt3 Jan 4, 2020
6281089
fix pLevelName potentially being uninitialized
Robyt3 Jan 5, 2020
5988cb9
Remove travis, appveyor and circleci
axblk Jan 3, 2020
40c8372
Add github actions workflow
axblk Jan 5, 2020
03b16e9
Fix sdl2 cmake module
axblk Jan 5, 2020
df7a52e
Fix windows build with bam
axblk Jan 5, 2020
9313b91
Fix freetype and sdl2 download with bam
axblk Jan 5, 2020
6573fac
Add pkg-config for github actions build
axblk Jan 5, 2020
3f8c5c6
Fix macos package name
axblk Jan 5, 2020
e5a1fa3
Use make and visual studio instead of ninja
axblk Jan 5, 2020
ab10577
Test cmake 3.5 on older ubuntu version
axblk Jan 5, 2020
cceb150
Merge pull request #2369 from axblk/gh_actions
oy Jan 6, 2020
b481e15
made the reset button in the settings turn off dynamic camera as it's…
oy Jan 6, 2020
f7b6685
Merge pull request #2370 from Robyt3/issue2274
oy Jan 6, 2020
8d0fbf6
merged 0.7.4
AssassinTee Jan 6, 2020
a81c8ef
added README back, so rude of git
AssassinTee Jan 6, 2020
6e79e5d
added missing merge
AssassinTee Jan 6, 2020
768d1df
added CATCH_VERSION back
AssassinTee Jan 6, 2020
2c2e15e
added c++11 back
AssassinTee Jan 6, 2020
c0750c2
updated to set c++11 flag, now needs minimum cmake 3.1
AssassinTee Jan 6, 2020
834e6ff
fixed another merge conflict
AssassinTee Jan 6, 2020
7eca7f3
added chat commands
AssassinTee Jan 6, 2020
b8581ab
fixed missing semicolon
AssassinTee Jan 6, 2020
7d3be30
added missing import
AssassinTee Jan 6, 2020
e0352e3
made stuff static
AssassinTee Jan 6, 2020
d8b9864
fixed missing class
AssassinTee Jan 6, 2020
83b9c1f
added GameController to callback
AssassinTee Jan 6, 2020
e4424e6
edited callback
AssassinTee Jan 6, 2020
98b569f
removed argument that is too much
AssassinTee Jan 6, 2020
b84de45
updated version to 1.1.1
AssassinTee Jan 6, 2020
5f88ba5
removed optional arguments
AssassinTee Jan 6, 2020
89da008
removed deprecated sendcommand-method by chat
AssassinTee Jan 6, 2020
c3a8833
added missing version numbers in info command
AssassinTee Jan 7, 2020
d70d20d
added missing include
AssassinTee Jan 7, 2020
1976e7d
Merge branch 'master' into dev
AssassinTee Jan 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions .circleci/config.yml

This file was deleted.

154 changes: 154 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
name: Build

on: [push]

jobs:
build-cmake:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest, ubuntu-16.04]
include:
- os: ubuntu-latest
cmake-args: -G "Unix Makefiles"
build-args: --parallel
package-file: teeworlds-*-linux_x86_64.tar.xz
env:
CFLAGS: -Wdeclaration-after-statement -Werror
CXXFLAGS: -Werror
- os: ubuntu-16.04
cmake-path: /usr/bin/
cmake-args: -G "Unix Makefiles"
package-file: teeworlds-*-linux_x86_64.tar.xz
env:
CFLAGS: -Wdeclaration-after-statement -Werror
CXXFLAGS: -Werror
- os: macOS-latest
cmake-args: -G "Unix Makefiles"
build-args: --parallel
package-file: teeworlds-*-osx.dmg
env:
CFLAGS: -Wdeclaration-after-statement -Werror
CXXFLAGS: -Werror
- os: windows-latest
cmake-args: -G "Visual Studio 16 2019" -A x64
package-file: teeworlds-*-win64.zip
env:
CFLAGS: /WX
CXXFLAGS: /WX
LDFLAGS: /WX

steps:
- uses: actions/checkout@v2
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

- name: Prepare Linux
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update -y
sudo apt-get install pkg-config cmake libfreetype6-dev libsdl2-dev -y

- name: Prepare MacOS
if: contains(matrix.os, 'macOS')
run: |
brew update
brew install pkg-config freetype sdl2

- name: Build in debug mode
env: ${{ matrix.env }}
run: |
mkdir debug
cd debug
${{ matrix.cmake-path }}cmake --version
${{ matrix.cmake-path }}cmake ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=Debug -Werror=dev -DDOWNLOAD_GTEST=ON -DDEV=ON -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG=. ..
${{ matrix.cmake-path }}cmake --build . --config Debug ${{ matrix.build-args }} --target everything
- name: Test debug
run: |
cd debug
${{ matrix.cmake-path }}cmake --build . --config Debug ${{ matrix.build-args }} --target run_tests
./teeworlds_srv shutdown

- name: Build in release mode
env: ${{ matrix.env }}
run: |
mkdir release
cd release
${{ matrix.cmake-path }}cmake ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=Release -Werror=dev -DDOWNLOAD_GTEST=ON -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE=. ..
${{ matrix.cmake-path }}cmake --build . --config Release ${{ matrix.build-args }} --target everything
- name: Test release
run: |
cd release
${{ matrix.cmake-path }}cmake --build . --config Release ${{ matrix.build-args }} --target run_tests
./teeworlds_srv shutdown

- name: Package
run: |
cd release
${{ matrix.cmake-path }}cmake --build . --config Release ${{ matrix.build-args }} --target package_default
mkdir artifacts
mv ${{ matrix.package-file }} artifacts

- name: Upload Artifacts
uses: actions/upload-artifact@v1
with:
name: teeworlds-${{ matrix.os }}
path: release/artifacts

build-bam:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]

steps:
- uses: actions/checkout@v2
- name: Checkout submodules
shell: bash
run: |
auth_header="$(git config --local --get http.https://github.com/.extraheader)"
git submodule sync --recursive
git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1

- name: Checkout bam
uses: actions/checkout@v2
with:
repository: matricks/bam
ref: 07fbb5543c692f6b9a7f09e48c64e2368349a3a8
path: ./bam

- name: Prepare Linux
if: contains(matrix.os, 'ubuntu')
run: |
sudo apt-get update -y
sudo apt-get install libfreetype6-dev libsdl2-dev -y
cd bam
./make_unix.sh

- name: Prepare MacOS
if: contains(matrix.os, 'macOS')
run: |
brew update
brew install freetype sdl2
cd bam
./make_unix.sh

- name: Prepare Windows
if: contains(matrix.os, 'windows')
run: |
cd bam
./make_win64_msvc.bat

- name: Build in debug mode
run: ./bam/bam conf=debug all
- name: Test debug
run: ./build/x86_64/debug/teeworlds_srv shutdown

- name: Build in release mode
run: ./bam/bam conf=release all
- name: Test release
run: ./build/x86_64/release/teeworlds_srv shutdown
16 changes: 16 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
/other/*/windows
__pycache__/
*.dll
*.dmg
*.pyc
*.pyo
scripts/work/
Expand All @@ -27,10 +28,25 @@ map_version*
mastersrv*
packetgen*
teeworlds*
!teeworlds.manifest
!teeworlds.rc
teeworlds_srv*
testrunner
versionsrv*

# IDE project files
.cproject
.idea
.project
.settings
.vs
.vscode
compile_commands.json
cscope.files
cscope.out
out
tags

# CMake
data
generated
Expand Down
18 changes: 0 additions & 18 deletions .travis.yml

This file was deleted.

Loading