BeamMP/BeamMP-Server
1
0 Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-10-25 21:40:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
741 Commits 63 Branches 48 Tags
11d4d9ff91e01ac9911de9dcdd952a4f62aebfea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lion Kortlepel 11d4d9ff91 remove old commandline path 2021-09-17 15:02:53 +02:00
Lion Kortlepel 48caae25fd Finalize master&new-lua-features merge 2021-09-17 14:58:40 +02:00
Lion Kortlepel 9dfe9f659a Update cmakelists to remove socket.io 2021-09-17 14:30:33 +02:00
Lion Kortlepel a07b5062de Reintroduce gitmodules 2021-09-17 14:28:45 +02:00
Lion Kortlepel fcbb188ee0 update modules, cmakelists 2021-09-17 14:25:11 +02:00
Lion Kortlepel 883d69ba27 Merge remote-tracking branch 'origin/master' into rewrite-lua 2021-09-17 14:24:12 +02:00
Lion Kortlepel 7459779363 update cmakelists 2021-09-17 14:21:20 +02:00
Lion Kortlepel a0c47d9947 move sentry-native 2021-09-17 14:17:27 +02:00
Lion Kortlepel 7db345cfbc update submodules 2021-09-17 13:36:16 +02:00
Lion Kortlepel 1d3958817f Merge remote-tracking branch 'origin/new-lua-features' into rewrite-lua 
This is the first of a few commits to merge the new lua features and the
rewrite
 2021-09-17 13:29:44 +02:00
Lion Kortlepel fd3088c78f Re-add SendChatMessage 2021-09-17 12:58:07 +02:00
Lion Kortlepel c2b73d93b5 Lua: Implement more core functions 2021-09-17 12:56:08 +02:00
Lion Kortlepel 9a37ed4341 Lua: Add GetPlayerName 2021-09-17 12:45:34 +02:00
Lion Kortlepel e64114e4fa Possible compiler fix 2021-09-17 02:44:49 +02:00
Lion Kortlepel 79531334dd another nice fix 2021-09-17 02:38:14 +02:00
Lion Kortlepel ed6f5282d9 Nice fix. 2021-09-17 02:36:06 +02:00
Lion Kortlepel 62fd369625 Lua: Fix more compile errors for windows 2021-09-17 02:30:20 +02:00
Lion Kortlepel 1880536276 Lua: Call onInit properly 2021-09-17 02:26:49 +02:00
Lion Kortlepel bac476ec34 Lua: Set package.path and package.cpath before onInit is called 2021-09-17 02:19:45 +02:00
Lion Kortlepel e75e65815c Lua: change a static_cast to a reinterpret_cast, fun times 
:^)
 2021-09-17 01:27:45 +02:00
Lion Kortlepel b0c467f971 Lua: Add timer 2021-09-17 01:25:52 +02:00
Lion Kortlepel 6b17990d4d Add GetOSTimeMS 2021-09-17 00:57:43 +02:00
Lion Kortlepel c73d56c143 Possible compiler fix 2021-09-17 00:54:41 +02:00
Lion Kortlepel a44050f0f1 Lua: Almost Working events, all triggers working 2021-09-17 00:21:43 +02:00
Lion Kortlepel cb1eb40def Lua: remove unimplemented 2021-09-16 22:31:54 +02:00
Lion Kortlepel 4c03a90157 Lua: Add more old API 2021-09-16 22:31:09 +02:00
Lion Kortlepel be61511bdf Fix CMake, Add more Lua API 2021-09-16 19:38:31 +02:00
Lion Kortlepel 968d9ff999 Lua: Implement most API functions 2021-09-16 19:00:13 +02:00
Lion Kortlepel 1c80a4deb7 Lua: working events, global and local 2021-09-16 18:14:11 +02:00
Lion Kortlepel e602decb96 Lua: Fix multiple issues with events 2021-09-16 14:58:47 +02:00
Lion Kortlepel dca573b15c Fix more compile issues with lua, add TriggerGlobalEvent 2021-09-16 13:06:04 +02:00
Lion Kortlepel 26231c6272 Fix compile issue with asio, implement Lua events 2021-09-16 13:03:00 +02:00
Lion Kortlepel ebe3630ec8 LuaAPI: Implement GetOSName 2021-09-16 12:22:49 +02:00
Lion Kortlepel d7f7a81cb0 LuaAPI: Print: dump tables properly and recursively 2021-09-16 12:21:11 +02:00
Lion Kortlepel 9ef6c32864 CMake: fix include paths 2021-09-16 11:59:00 +02:00
Lion Kortlepel 9b9c18a4c1 Lua: Add variadic print, LuaAPI 2021-09-16 11:54:52 +02:00
Lion Kortlepel 5978665ad6 Lua: Fix threading related crash 2021-09-16 10:07:04 +02:00
Lion Kortlepel 2cf368c2b0 First working console 2021-09-16 03:40:24 +02:00
Lion Kortlepel ba0678dade Continue Lua Rewrite 2021-09-16 03:21:00 +02:00
Lion Kortlepel c309fa28c6 update sol2 to v3.2.3 2021-09-16 01:09:24 +02:00
Lion Kortlepel f5b2be0a03 rename Assert to beammp_assert 2021-09-16 01:04:38 +02:00
Lion Kortlepel dd4e4c4467 Start rewrite of lua, rename all print functions 2021-09-16 01:04:01 +02:00
Lion Kortlepel d082620525 add sol2 2021-09-16 00:34:09 +02:00
Lion Kortlepel be90a8a2c0 add sol2 2021-09-16 00:33:13 +02:00
Lion Kortlepel 8b69127cdd Finish moving deps to deps/ 2021-09-16 00:22:33 +02:00
Lion Kortlepel bb34378b8e Move all dependencies to deps/ 2021-09-16 00:09:39 +02:00
Lion Kortlepel 2355327c21 CMake: Fix typo in SANITIZE codepath 2021-09-15 17:55:34 +02:00
Lion Kortlepel 3837e101e2 CMake: Use gzipped debug info on linux 2021-09-15 17:55:34 +02:00
Lion Kortlepel fa19ba08e3 Sentry: Properly store DSN 2021-09-15 17:55:34 +02:00
Lion Kortlepel 57d0eb735e Add cryptography header for the future 2021-09-15 17:55:34 +02:00
Lion Kortlepel 15704abf6c Http, Heartbeat: Process status < 0 differently, report as "Invalid 
Response Code"
 2021-09-15 17:55:34 +02:00
Lion Kortlepel 6883c96d33 Http: Add Sentry error breadcrumbs on internal https POST errors 2021-09-15 17:55:34 +02:00
Lion Kortlepel f632606d76 Heartbeat: Dont report 200 + INVALID_KEY to Sentry 2021-09-15 17:55:34 +02:00
Lion Kortlepel c70ada2926 Config: private by default 2021-09-15 17:55:34 +02:00
Lion Kortlepel 80aebcb9a7 Actions: prerelease by default 2021-09-13 11:58:01 +03:00
Lion Kortlepel 3fc397814c Move update check to after initialization (since its blocking) 2021-09-11 11:38:06 +03:00
Lion Kortlepel 6542be09ee Clarify what sentry sends, add a way to turn off the warning 2021-09-11 11:38:06 +03:00
Lion Kortlepel 38b934bc0f Move signal handling into its own translation unit to limit overlap 2021-09-11 11:38:06 +03:00
Lion Kortlepel a2f92b5791 Update changelog, use std::exit instead of exit 2021-09-11 11:38:06 +03:00
Lion Kortlepel 30624c77a2 Update commandline; reset terminal before exit 2021-09-11 11:38:06 +03:00
Lion Kortlepel b1664bb184 Application: Perform hard-shutdown after 3 Ctrl+C's 2021-09-11 11:38:06 +03:00
Lion Kortlepel ffac000cd2 Config: Add basic opt-out for Sentry 2021-09-11 11:38:06 +03:00
Lion Kortlepel 3cd94380e2 Changelog: Add recent additions 2021-09-11 11:38:06 +03:00
Lion Kortlepel b055fd8bda GracefullyShutdown: Add "subsystem x/y shutting down" message 
Remove old "X shutting down", "X shut down" messages, they were bad and
confusing
 2021-09-11 11:38:06 +03:00
Lion Kortlepel d43ee4b7b6 Bump version to 2.3.2 2021-09-11 11:38:06 +03:00
Lion Kortlepel a514591650 Main: Add Ctrl+C handler for windows 2021-09-11 11:38:06 +03:00
Lion Kortlepel 0f9f81e9fa Http: Add cloudflare 5XX status code strings 2021-09-11 11:38:06 +03:00
Lion Kortlepel 11e94e91a7 Update Changelog.md to reflect latest changes in recent merge from #44 2021-09-10 13:41:45 +03:00
Lion Kortlepel 588242822c CMake: Remove socketio link, forgot 2021-09-09 12:33:59 +03:00
Lion Kortlepel 58da200901 Client: fix socklen_t compile error 2021-09-09 12:32:33 +03:00
Lion Kortlepel f4ccf6c177 add sentry native db folder to gitignore 2021-09-09 12:26:26 +03:00
Lion Kortlepel 27103a73a9 remove socket.io module 2021-09-09 12:26:03 +03:00
Lion Kortlepel 2727f90430 Remove Socket.io for now 
it is being built every time and we dont need it
 2021-09-09 12:25:08 +03:00
Lion Kortlepel 2a96546c8c Lua: Add GetPluginName, GetPluginPath 2021-09-09 12:15:57 +03:00
Lion Kortlepel 6462636b29 Multiple merge fixes, rebase, working Https::GET 2021-09-09 12:15:55 +03:00
Lion Kortlepel 5742ab0dad possible windows compiler fix 2021-09-09 12:15:19 +03:00
Lion Kortlepel 0087205d55 fix issues caused by rebase 2021-09-09 12:15:17 +03:00
Lion Kortlepel d16843e45d TNetwork: clarify error messages 2021-09-09 12:14:32 +03:00
Lion Kortlepel 24516dbfd7 TNetwork: setsockopt: cast optval to void* 2021-09-09 12:14:32 +03:00
Lion Kortlepel a311d58e11 TNetwork: reuseaddr instead of reuseport 2021-09-09 12:14:32 +03:00
Lion Kortlepel 1444d91e7e Common: missed semicolon 2021-09-09 12:14:32 +03:00
Lion Kortlepel 1e2f060107 improve error reporting, remove duplicate code 2021-09-09 12:14:32 +03:00
Lion Kortlepel fdb5da2ed6 CMake: remove mentions of luasocket again 2021-09-09 12:14:32 +03:00
Lion Kortlepel de57613326 remove luasocket-cmake 2021-09-09 12:14:32 +03:00
Lion Kortlepel b49782e8a3 Common: Add sstream include for std::stringstream 2021-09-09 12:14:32 +03:00
Lion Kortlepel ff80b4cf63 CMake: include luasocket after finding lua 2021-09-09 12:14:32 +03:00
Lion Kortlepel 4c23b78f84 add luasocket 2021-09-09 12:14:32 +03:00
Lion Kortlepel aca3c52c20 remove luasocket again 2021-09-09 12:14:32 +03:00
Lion Kortlepel 51d6c4fb0a add CMakeLists for lib/ 2021-09-09 12:14:32 +03:00
Lion Kortlepel 2af9491fd6 add luasocket submodule 2021-09-09 12:14:32 +03:00
Lion Kortlepel 95c036836e add ws2tcpip.h 2021-09-09 12:14:32 +03:00
Lion Kortlepel a7f2f85e45 fix version printing 2021-09-09 12:14:32 +03:00
Lion Kortlepel 42c5aaad5a use inet_ntop instead of inet_ntoa (STILL BROKEN THOUGH) 2021-09-09 12:14:32 +03:00
Lion Kortlepel 88684bd9af clarify installation 2021-09-09 12:14:32 +03:00
Lion Kortlepel c6457f7df4 Add Settings enum, better print 2021-09-09 12:14:32 +03:00
Lion Kortlepel ba3fd0e144 add GetServerVersion 2021-09-09 12:14:30 +03:00
Lion Kortlepel e3b6fd7998 use fake version for lua update for now 2021-09-09 12:13:45 +03:00
Lion Kortlepel 943159cd40 Lua: add onShutdown 2021-09-09 12:13:37 +03:00
Lion Kortlepel 9423831937 add ip to identifiers, changed value format 2021-09-09 12:13:34 +03:00
Lion Kortlepel 95188042c5 fix luatable in GetPlayerIdentifiers 2021-09-09 12:12:54 +03:00