Skip to content

Commit d771694

Browse files
authored
Merge pull request #207 from mapbase-source/develop
Mapbase v7.1
2 parents 4aeaaa4 + bbd8d86 commit d771694

69 files changed

Lines changed: 5564 additions & 386 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CONTRIBUTING.md

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,31 +23,40 @@ All contributions must follow the following rules:
2323
is usually not fit for Mapbase.
2424

2525
* All content in a contribution must be either already legally open-source or done with the
26-
full permission of the content's original creator(s). If licensing is involved, the contribution
27-
must ensure Mapbase follows said licensing.
26+
full permission of the content's original creator(s). If a license is involved, the contributor
27+
should ensure Mapbase conforms to its terms.
2828
* **NOTE:** Due to concerns with mods which do not wish to be open-source, content using GPL licenses (or any
2929
license with similar open-source requirements) are currently not allowed to be distributed with Mapbase.
30-
Contributions which can draw from them without actually distributing the licensed content may theoretically
31-
be excepted from this rule.
30+
Contributions which can draw from them without actually distributing the licensed content may be excepted
31+
from this rule.
3232

3333
* Contributions must not break existing maps/content or interfere with them in a negative or non-objective way.
3434

3535
* Code contributions are not obliged to follow Mapbase's preprocessor conventions (e.g. #ifdef MAPBASE),
3636
although following them is usually acceptable.
3737

38+
* Code contributions which modify or add onto existing code should generally match its syntax and shouldn't
39+
change the spacing unless necessary.
40+
3841
* If you are contributing a file you created yourself specifically for Mapbase, you are required to
3942
use the custom "Mapbase - Source 2013" header used in other Mapbase files as of Mapbase v5.0.
4043
You are encouraged to append an "Author(s)" part to that header in your file in order to clarify who wrote it.
4144

4245
* Do not modify the README to add attribution for your contribution. That is handled by Mapbase's maintainers.
4346

44-
Contributions which do not follow these guidelines cannot be accepted into Mapbase.
45-
46-
Attempting to contribute content which seriously violates the rules above can lead to being blocked from contributing,
47-
especially if done repeatedly.
47+
Contributions which do not follow these guidelines cannot be accepted into Mapbase. Attempting to contribute content
48+
which seriously violates the rules above can lead to being blocked from contributing, especially if done repeatedly.
4849

4950
---
50-
51+
52+
Mapbase uses GitHub Actions to help manage issues and pull requests. Some of these workflows build the code of incoming
53+
contributions to make sure they compile properly. The code is compiled separately for Visual Studio 2022 and GCC/G++ 9 (Linux)
54+
and on both Debug and Release configurations.
55+
56+
If these workflows fail, don't freak out! Accidents can happen frequently due to compiler syntax differences and conflicts
57+
from other contributions. You can look at a failed workflow's log by clicking "Details", which will include the build's output
58+
in the "Build" step(s). Any errors must be resolved by you and/or by code reviewers before a pull request can be merged.
59+
5160
If your contribution is accepted, you may be listed in Mapbase's credits and the README's external content list:
5261
https://github.com/mapbase-source/source-sdk-2013/wiki/Mapbase-Credits#Contributors
5362
https://github.com/mapbase-source/source-sdk-2013/blob/master/README

.github/labeler.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#
2+
# MAPBASE REPO AUTOMATION
3+
#
4+
# Automatically labels pull requests according to changed file paths.
5+
# See mapbase_pr.yml for more information.
6+
#
7+
Repo:
8+
- '*'
9+
- '.github/**'
10+
11+
Project Generation:
12+
- '**/src/vpc_scripts/**'
13+
- '**/src/devtools/**'
14+
- '**/src/create*'
15+
16+
Entities:
17+
- '**/src/game/**/**logic**'
18+
- '**/src/game/**/**point**'
19+
20+
Shaders:
21+
- '**/src/materialsystem/**'
22+
23+
VScript:
24+
- '**vscript**'
25+
26+
Tools:
27+
- '**utils**'
28+
29+
NPCs:
30+
- '**npc_**'
31+
- '**ai_**'
32+
33+
VGUI:
34+
- '**hud_**'
35+
- '**vgui_**'
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
#
2+
# MAPBASE SOURCE 2013 CI
3+
#
4+
# This can be used to manually build the codebase.
5+
#
6+
# See mapbase_build-base.yml for more information on how this works.
7+
8+
name: Build Projects (Manual)
9+
10+
on:
11+
workflow_dispatch:
12+
inputs:
13+
configuration:
14+
description: 'Which configuration to build with'
15+
default: 'Release'
16+
required: true
17+
type: choice
18+
options:
19+
- Release
20+
- Debug
21+
branch:
22+
description: 'Which Source 2013 engine branch to compile for'
23+
default: 'sp'
24+
required: true
25+
type: choice
26+
options:
27+
- sp
28+
- mp
29+
game:
30+
description: 'Name of the game to build (if relevant)'
31+
default: 'episodic'
32+
required: false
33+
type: choice
34+
options:
35+
- episodic
36+
- hl2
37+
project-group:
38+
description: 'Which group of projects to compile'
39+
required: true
40+
type: choice
41+
options:
42+
- all
43+
- game
44+
- shaders
45+
- maptools
46+
solution-name:
47+
description: 'Name of the solution/makefile'
48+
required: true
49+
type: choice
50+
options:
51+
- everything
52+
- games
53+
- shaders
54+
- maptools
55+
build-on-linux:
56+
description: 'Build on Ubuntu/Linux?'
57+
default: true
58+
required: false
59+
type: boolean
60+
61+
jobs:
62+
build_manual:
63+
uses: ./.github/workflows/mapbase_build-base.yml
64+
with:
65+
configuration: '${{ github.event.inputs.configuration }}'
66+
branch: '${{ github.event.inputs.branch }}'
67+
game: '${{ github.event.inputs.game }}'
68+
project-group: '${{ github.event.inputs.project-group }}'
69+
solution-name: '${{ github.event.inputs.solution-name }}'
70+
build-on-linux: '${{ github.event.inputs.build-on-linux }}'

0 commit comments

Comments
 (0)