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: Soldia1138/intercept-plugin-template
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: intercept/intercept-plugin-template
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 8 commits
  • 5 files changed
  • 4 contributors

Commits on Aug 3, 2018

  1. Copy the full SHA
    a16bee1 View commit details

Commits on Aug 5, 2018

  1. Copy the full SHA
    db489f7 View commit details
  2. Copy the full SHA
    505e087 View commit details

Commits on Aug 16, 2018

  1. Copy the full SHA
    451bd17 View commit details

Commits on Sep 9, 2018

  1. Travis CI

    Dahlgren committed Sep 9, 2018
    Copy the full SHA
    1ef5c63 View commit details
  2. Copy the full SHA
    8553f0c View commit details

Commits on May 4, 2019

  1. Update to API Version 2

    dedmen committed May 4, 2019
    Copy the full SHA
    8b610cb View commit details

Commits on Feb 3, 2021

  1. Update intercept submodule

    dedmen committed Feb 3, 2021
    Copy the full SHA
    0398b60 View commit details
Showing with 25 additions and 6 deletions.
  1. +19 −0 .travis.yml
  2. +2 −2 addons/main/config.cpp
  3. +1 −1 intercept
  4. +2 −2 src/CMakeLists.txt
  5. +1 −1 src/main.cpp
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
dist: trusty

language: cpp

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-7
- gcc-7-multilib
- g++-7
- g++-7-multilib

before_script:
- CXX=g++-7 CC=gcc-7 cmake .

script:
- make
4 changes: 2 additions & 2 deletions addons/main/config.cpp
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ class CfgPatches {
class Intercept {
class Dedmen { //Change this. It's either the name of your project if you have more than one plugin. Or just your name.
class template_plugin { //Change this.
pluginName = "Intercept Template Plugin"; //Change this.
pluginName = "template-plugin"; //Change this.
};
};
};
};
2 changes: 1 addition & 1 deletion intercept
Submodule intercept updated 93 files
+125 −0 .github/workflows/ci.yml
+20 −0 .gitignore
+42 −10 .travis.yml
+30 −0 CMakeInclude.txt
+7 −0 CMakeLists.txt
+3 −3 CMakeModules/cxx_compiler_functions.cmake
+0 −0 addons/core/$PBOPREFIX$
+0 −0 addons/core/boot.sqf
+125 −0 addons/core/config.cpp
+0 −0 addons/core/event.sqf
+0 −0 addons/core/initFunctionsWrapper.sqf
+0 −0 addons/core/initFunctionsWrapperx.sqf
+3 −2 addons/core/lib.sqf
+0 −0 addons/core/post_init.sqf
+0 −0 addons/core/signal.sqf
+7 −7 appveyor.yml
+11 −0 hemtt.toml
+4 −0 linux/toolchain.cmake
+2 −0 linux64/toolchain.cmake
+0 −984 rv/addons/core/config.cpp
+2 −2 src/client/CMakeLists.txt
+18 −0 src/client/headers/client/client.hpp
+3 −0 src/client/headers/client/eventhandlers.hpp
+2 −0 src/client/headers/client/pointers.hpp
+3 −0 src/client/headers/client/sqf/ai.hpp
+83 −4 src/client/headers/client/sqf/config.hpp
+2 −2 src/client/headers/client/sqf/core.hpp
+37 −18 src/client/headers/client/sqf/ctrl.hpp
+10 −2 src/client/headers/client/sqf/intersects.hpp
+36 −34 src/client/headers/client/sqf/inventory.hpp
+7 −2 src/client/headers/client/sqf/marker.hpp
+22 −2 src/client/headers/client/sqf/misc.hpp
+15 −0 src/client/headers/client/sqf/position.hpp
+17 −1 src/client/headers/client/sqf/sound.hpp
+2 −1 src/client/headers/client/sqf/sqf.hpp
+3 −3 src/client/headers/client/sqf/units.hpp
+8 −1 src/client/headers/client/sqf/vehicles.hpp
+5 −0 src/client/headers/client/sqf/waypoint.hpp
+2 −2 src/client/headers/client/sqf/world.hpp
+131 −18 src/client/headers/client/sqf_assignments.hpp
+131 −18 src/client/headers/client/sqf_pointers_declaration.hpp
+130 −17 src/client/headers/client/sqf_pointers_definitions.hpp
+2 −0 src/client/headers/intercept.hpp
+2 −7 src/client/headers/shared.hpp
+21 −16 src/client/headers/shared/client_types.hpp
+754 −347 src/client/headers/shared/containers.hpp
+7 −3 src/client/headers/shared/functions.hpp
+716 −390 src/client/headers/shared/types.hpp
+2 −3 src/client/headers/shared/vector.hpp
+11 −4 src/client/intercept/client/client.cpp
+22 −14 src/client/intercept/client/eventhandlers.cpp
+2 −0 src/client/intercept/client/pointers.cpp
+15 −2 src/client/intercept/client/sqf/ai.cpp
+22 −2 src/client/intercept/client/sqf/config.cpp
+19 −15 src/client/intercept/client/sqf/core.cpp
+40 −2 src/client/intercept/client/sqf/ctrl.cpp
+7 −3 src/client/intercept/client/sqf/group.cpp
+23 −8 src/client/intercept/client/sqf/intersects.cpp
+25 −7 src/client/intercept/client/sqf/inventory.cpp
+21 −8 src/client/intercept/client/sqf/marker.cpp
+25 −2 src/client/intercept/client/sqf/misc.cpp
+35 −4 src/client/intercept/client/sqf/position.cpp
+10 −6 src/client/intercept/client/sqf/sound.cpp
+2 −2 src/client/intercept/client/sqf/units.cpp
+29 −4 src/client/intercept/client/sqf/vehicles.cpp
+10 −1 src/client/intercept/client/sqf/waypoint.cpp
+8 −4 src/client/intercept/client/sqf/world.cpp
+1 −1 src/client/intercept/shared/containers.cpp
+50 −44 src/client/intercept/shared/types.cpp
+5 −17 src/host/CMakeLists.txt
+4 −0 src/host/common/CMakeLists.txt
+1 −1 src/host/common/dispatch.hpp
+3 −2 src/host/common/easyloggingc++.hpp
+4 −1 src/host/common/shared.hpp
+0 −8 src/host/common/targetver.h
+1 −0 src/host/controller/CMakeLists.txt
+40 −40 src/host/controller/controller.cpp
+5 −0 src/host/extensions/CMakeLists.txt
+7 −0 src/host/extensions/export.cpp
+3 −1 src/host/extensions/export.hpp
+25 −5 src/host/extensions/extensions.cpp
+14 −11 src/host/extensions/search.cpp
+79 −70 src/host/extensions/signing.cpp
+1 −1 src/host/extensions/signing.hpp
+47 −1 src/host/intercept_dll/CMakeLists.txt
+1 −0 src/host/invoker/CMakeLists.txt
+11 −7 src/host/invoker/invoker.cpp
+2 −1 src/host/invoker/invoker.hpp
+27 −5 src/host/invoker/sqf_functions.cpp
+9 −0 src/host/invoker/sqf_functions.hpp
+1 −0 src/host/loader/CMakeLists.txt
+41 −66 src/host/loader/loader.cpp
+11 −10 src/host/loader/loader.hpp
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -45,9 +45,9 @@ set_target_properties(${INTERCEPT_PLUGIN_NAME} PROPERTIES FOLDER "${CMAKE_PROJEC
if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "-std=c++1z -O2 -s -fPIC -fpermissive -static-libgcc -static-libstdc++")#-march=i686 -m32
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(CMAKE_SHARED_LINKER_FLAGS "-static -static-libgcc -static-libstdc++")
set(CMAKE_SHARED_LINKER_FLAGS "-shared -static-libgcc -static-libstdc++")
else()
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MTd /Zi /Ob0 /Od /RTC1 /MP /EHsc")
set(CMAKE_CXX_FLAGS_RELEASE "/MT /Zi /O2 /Ob1 /EHsc /MP") #with debug info
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "/OPT:REF /DEBUG:FULL")
endif()
endif()
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@


int intercept::api_version() { //This is required for the plugin to work.
return 1;
return INTERCEPT_SDK_API_VERSION;
}

void intercept::register_interfaces() {