Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
fantasylidong committed Jun 22, 2023
2 parents 4c0e442 + 044a58d commit 0e99abe
Show file tree
Hide file tree
Showing 61 changed files with 6,943 additions and 3,174 deletions.
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Bug report
about: Create a report to help us improve
title: "[BUG]"
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Screenshots/Video**
If applicable, add screenshots and/or video to help explain your problem.

**Server Operating System (if applicable):**
- Linux/Windows

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this repository
title: "[Request]"
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This is mainly a project that focuses on reworking the very outdated platform fo
It will contain both much needed fixes that are simply unable to be implemented on the older sourcemod versions as well as incompatible and outdated files being updated to working versions.

> **Included Matchmodes:**
* **Zonemod 2.8.2**
* **Zonemod 2.8.4**
* **Zonemod Hunters**
* **Zonemod Retro**
* **NeoMod 0.4a**
Expand Down
6 changes: 3 additions & 3 deletions addons/sourcemod/configs/matchmodes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
{
"zonemod"
{
"name" "ZoneMod 2.8.3"
"name" "ZoneMod 2.8.4"
}
"zoneretro"
{
"name" "ZoneMod Retro 2.8.3"
"name" "ZoneMod Retro 2.8.4"
}
"zm3v3"
{
Expand Down Expand Up @@ -128,7 +128,7 @@
{
"zonehunters"
{
"name" "ZoneHunters 2.8.3"
"name" "ZoneHunters 2.8.4"
}
"zh3v3"
{
Expand Down
10 changes: 4 additions & 6 deletions addons/sourcemod/configs/saferoominfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -993,15 +993,13 @@
{
"start_loc_a" "10768.80 4886.78 -11.37"
"start_loc_b" "11091.48 4574.21 166.96"
"end_loc_a" "12255.21 12700.63 172.12"
"end_loc_b" "12439.00 12176.21 -3.81"
"end_loc_c" "12255.21 12700.63 172.12"
"end_loc_d" "12484.85 12447.17 -23.33"
"end_loc_a" "12624 12456 152"
"end_loc_b" "12920 12688 16"
}
"nmrm4_hospital"
{
"start_loc_a" "12263.98 12174.36 147.93"
"start_loc_b" "12514.85 12668.99 -9.95"
"start_loc_a" "12624 12456 152"
"start_loc_b" "12920 12688 16"
"end_loc_a" "11273.65 15111.59 5726.53"
"end_loc_b" "11709.37 14721.27 5517.87"
}
Expand Down
11 changes: 9 additions & 2 deletions addons/sourcemod/gamedata/l4d_fix_shove_duration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@
"CTerrorPlayer::OnShovedByLunge"
{
"signature" "CTerrorPlayer::OnShovedByLunge"
"callconv" "cdecl"
"linux"
{
"callconv" "cdecl"
}
"windows"
{
"callconv" "stdcall"
}
"return" "int"
"this" "ignore"
"arguments"
Expand Down Expand Up @@ -102,4 +109,4 @@
}
}
}
}
}
Loading

0 comments on commit 0e99abe

Please sign in to comment.