Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Garey27/addtofullpack_manager
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.0
Choose a base ref
...
head repository: Garey27/addtofullpack_manager
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 16 commits
  • 13 files changed
  • 3 contributors

Commits on May 18, 2020

  1. Refactoring code

    ddenzer committed May 18, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    9d33039 View commit details
  2. bump version

    ddenzer committed May 18, 2020
    Copy the full SHA
    e78539d View commit details
  3. update readme

    ddenzer authored May 18, 2020
    Copy the full SHA
    6a474df View commit details

Commits on Nov 13, 2024

  1. Little refactoring

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    dd0e372 View commit details
  2. Move workflows dir

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    dfb16d7 View commit details
  3. Test changes

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    2eb614a View commit details
  4. Test changes

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    3f6bbd0 View commit details
  5. Test changes

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    9d3bc23 View commit details
  6. Update container

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    a9917d9 View commit details
  7. Update cmake.yml

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    c556b53 View commit details
  8. Change binary path in workflow

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    3051cbb View commit details
  9. Update checkout to v4

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    f87becb View commit details
  10. Set /MT for windows

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    1ccb7e0 View commit details
  11. Fix windows linking

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    8837386 View commit details
  12. Downgrade CMake required version

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    a76c8b0 View commit details
  13. Test release uploading

    Garey Akhmetshin committed Nov 13, 2024
    Copy the full SHA
    c83d11d View commit details
104 changes: 104 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: CMake

on: [push, pull_request]

jobs:
build_linux:
runs-on: ubuntu-20.04
container: debian:11-slim

env:
CMAKE_TOOLCHAIN_FILE: ${{github.workspace}}/cmake/linux-i686.cmake

steps:
- uses: actions/checkout@v4

- name: Install dependencies
run: |
dpkg --add-architecture i386
apt-get update
apt-get install -y \
gcc-multilib g++-multilib \
build-essential \
libc6-dev libc6-dev-i386 \
git cmake rsync \
g++ gcc
- name: Configure CMake
# Use a bash shell so we can use the same syntax for environment variable
# access regardless of the host operating system
shell: bash
# Note the current convention is to use the -S and -B options here to specify source
# and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: rm -rf build && CC=gcc CXX=g++ cmake -B build && cmake --build build -j

- name: Deploy artifacts
uses: actions/upload-artifact@v4
with:
name: linux
path: ${{github.workspace}}/build/addtofullpack_manager_amxx_i386.so

build_windows:
runs-on: windows-latest

steps:
- uses: actions/checkout@v4
-
name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory
# We'll use this as our working directory for all subsequent commands
run: cmake -E make_directory ${{github.workspace}}/build

- name: Configure CMake
# Use a bash shell so we can use the same syntax for environment variable
# access regardless of the host operating system
shell: bash
working-directory: ${{github.workspace}}/build
# Note the current convention is to use the -S and -B options here to specify source
# and build directories, but this is only available with CMake 3.13 and higher.
# The CMake binaries on the Github Actions machines are (as of this writing) 3.12
run: cmake .. -A Win32 -DCMAKE_BUILD_TYPE=Release

- name: Build
working-directory: ${{github.workspace}}/build
shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --config Release --parallel

- name: Deploy artifacts
uses: actions/upload-artifact@v4
with:
name: windows
path: ${{github.workspace}}/build/Release/addtofullpack_manager_amxx.dll
publish:
name: 'Publish'
runs-on: ubuntu-latest
needs: [build_windows, build_linux]
if: startsWith(github.ref, 'refs/tags/')
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: Deploying linux artifacts
uses: actions/download-artifact@v4
with:
name: linux

- name: Deploying windows artifacts
uses: actions/download-artifact@v4
with:
name: windows

- name: Archive artifacts
run: |
mkdir -p amxmodx/scripting/include amxmodx/modules
cp addtofullpack_manager_amxx.dll addtofullpack_manager_amxx_i386.so amxmodx/modules
cp include/addtofullpack_manager.inc amxmodx/scripting/include
7z a -tzip addtofullpack_manager-bin-${RELEASE_VERSION}.zip amxmodx
- name: Release
uses: softprops/action-gh-release@v2
with:
files: addtofullpack_manager-bin-*.zip
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -447,3 +447,5 @@ dkms.conf
*.exe
*.out
*.app

CMakeSettings.json
12 changes: 5 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
#-------------------------------------------------------------------------------------------

# Require a minimum version of cmake.
cmake_minimum_required(VERSION 3.13.5 FATAL_ERROR)
cmake_minimum_required(VERSION 3.18)

# Set the name of the project.
project("addtofullpack_manager")
@@ -45,10 +45,13 @@ set(CMAKE_RULE_MESSAGES ON)
set(CMAKE_VERBOSE_MAKEFILE OFF)

include(cmake/Tools.cmake)
include(cmake/cmake-version4git.cmake)

PROJECT_VERSION_FROM_GIT()
add_definitions(${PROJECT_VERSION4GIT_CFLAGS})
set_build_type()
set_output_binary_name()
set_default_parallel_jobs()
set_binary_output_directory("bin")


#-------------------------------------------------------------------------------------------
@@ -79,11 +82,6 @@ target_sources(${CMAKE_PROJECT_NAME} PRIVATE ${sources_list})
#-------------------------------------------------------------------------------------------

include(cmake/Definitions.cmake)
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE
REHLDS_FIXES
REGAMEDLL_FIXES
REGAMEDLL_API
)


#-------------------------------------------------------------------------------------------
27 changes: 27 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"configurations": [
{
"name": "x86-Release",
"generator": "Ninja",
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x86" ]
},
{
"name": "x86-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x86" ],
"variables": []
}
]
}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -5,4 +5,5 @@
Возможности нативов:
- Изменять enity_state для игрока к энтити
- Изменять semiclip для игрока к энтити
- Игнорировать определенные энтити в traceline/hull
- Игнорировать определенные энтити в traceline/hull
- Работать с should collide
Loading