Skip to content

Commit 4b52948

Browse files
authored
Merge branch 'master' into master
2 parents a09c73c + 4eb8d09 commit 4b52948

File tree

2,862 files changed

+74504
-23965
lines changed

Some content is hidden

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

2,862 files changed

+74504
-23965
lines changed

.github/workflows/deploy-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ jobs:
2121
- uses: actions/checkout@v3
2222
- uses: superfly/flyctl-actions/setup-flyctl@master
2323
with:
24-
version: 0.1.101
24+
version: 0.3.221
2525
- run: flyctl deploy --remote-only --wait-timeout 300

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
data/
1+
/data/
22
*.exe
33
node_modules
44
.env

app/transports/api/launcher/api.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,25 @@ func Build() fx.Option {
3636
}),
3737
)
3838

39-
launcherInfo := map[string]string{
40-
"version": cfg.LauncherVersion,
41-
"download": "https://github.com/openmultiplayer/launcher/releases/latest",
42-
"ompPluginChecksum": "6e1ec45fe13e4cf622740577ac625f2a",
43-
"ompPluginDownload": "https://assets.open.mp/omp-client.dll",
39+
launcherInfo := map[string]any{
40+
"version": cfg.LauncherVersion, // Deprecated, keeping it for backward compatibility
41+
"download": "https://github.com/openmultiplayer/launcher/releases/latest", // Deprecated, keeping it for backward compatibility
42+
"ompPluginChecksum": "6e1ec45fe13e4cf622740577ac625f2a", // Deprecated, keeping it for backward compatibility
43+
"ompPluginDownload": "https://assets.open.mp/omp-client.dll", // Deprecated, keeping it for backward compatibility
4444
"changelog": `|- Build 1 - 2023/10/08
45-
Release beta version`,
45+
Release beta version`, // Deprecated, keeping it for backward compatibility
46+
"versions": map[string]any{
47+
"5": map[string]string{ // Version 5 doesn't actually use information from his object, just keeping it for future reference
48+
"download": "https://github.com/openmultiplayer/launcher/releases/latest",
49+
"ompPluginChecksum": "6e1ec45fe13e4cf622740577ac625f2a",
50+
"ompPluginDownload": "https://assets.open.mp/omp-client.dll",
51+
},
52+
"6": map[string]string{
53+
"download": "https://github.com/openmultiplayer/launcher/releases/latest",
54+
"ompPluginChecksum": "865da2905ba33153c9db9462915db006",
55+
"ompPluginDownload": "https://assets.open.mp/omp-client-6.dll",
56+
},
57+
},
4658
}
4759

4860
rtr.Get("/", func(w http.ResponseWriter, rq *http.Request) {

frontend/blog/2020-11-23-interview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ yeah let's move on to the next bigger things
172172

173173
**Potassium:**
174174
yeah that's right. alright so we had a bunch of questions on our forum, which by the way is
175-
http://burgershot.gg so sign up there!
175+
https://forum.open.mp so sign up there!
176176
so i guess let's just get into them.
177177
the most pressing question right now obviously is regarding the recent samp drama. so for those who don't know the samp forum and the samp wiki have been offline for a few weeks now, and we don't want to make assumptions but it doesn't look like they're coming
178178
back anytime soon. i think that's a pretty fair assumption to make.
@@ -261,7 +261,7 @@ i think it was like polish, brazilian, and... yeah... we lacked a lot.
261261
yeah translating that is a definitely a priority and we've got some good people to help us with that so that's brilliant
262262

263263
**Potassium:**
264-
yeah that's awesome. just for the record, http://burgershot.gg is our forum and http://open.mp docs is our wiki, so go there!
264+
yeah that's awesome. just for the record, https://forum.open.mp is our forum and https://open.mp/docs is our wiki, so go there!
265265
so obviously the next discord alert noise that scared me, sorry! the next most frequently asked question is and always will be is the release date. so obviously we don't have a date, we will never give a specific date because we're all volunteers and do this in our free time, but do we have a rough idea of maybe like a percentage of how far along we are before we can make it public? are 1% through? are we halfway through? are we 90% through? what do you think?
266266

267267
**JustMichael:**
@@ -748,7 +748,7 @@ so i think the really important thing to take away from that is that we are a no
748748
but that doesn't mean there won't be ways to advertise. and if you have ideas about thatm post on the forums!
749749

750750
**Potassium:**
751-
yes, and that is http://burgershot.gg - sign up!
751+
yes, and that is https://forum.open.mp - sign up!
752752

753753
**Y_Less:**
754754
that's something we've discussed for like two years and we have no conclusion
@@ -937,7 +937,7 @@ yes, that's the second version
937937
that's the fun part
938938

939939
**Potassium:**
940-
people were asking about other communities that speak different languages and such, and they kind of want to know what we're doing to work with those communities and how we plan on spreading the word to those communities. i think it's fair to say that we're working on that, we're recruiting volunteers i guess to translate our wiki pages and whatever else to other languages, to moderate language sections on the forum, http://burgershot.gg by the way, and generally just to be the point of contact between our team and the other communities i guess
940+
people were asking about other communities that speak different languages and such, and they kind of want to know what we're doing to work with those communities and how we plan on spreading the word to those communities. i think it's fair to say that we're working on that, we're recruiting volunteers i guess to translate our wiki pages and whatever else to other languages, to moderate language sections on the forum, https://forum.open.mp by the way, and generally just to be the point of contact between our team and the other communities i guess
941941

942942
**JustMichael:**
943943
we've made a huge effort already to translate the wiki, so we're making an improvement to

frontend/blog/2022-09-08-server-beta-9.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
slug: server-beta-9
3-
title: SA-MP 0.3DL compatibility plus other added features and bug fixes - SERVER BETA RELEASE 9
3+
title: SA-MP 0.3.DL compatibility plus other added features and bug fixes - SERVER BETA RELEASE 9
44
authors: potassium
55
---
66

7-
We've just released open.mp server beta 9, bringing major improvements, fixes, and the highly anticipated SA:MP 0.3DL support! This update includes new features, better plugin compatibility, and enhanced server configuration options.
7+
We've just released open.mp server beta 9, bringing major improvements, fixes, and the highly anticipated SA:MP 0.3.DL support! This update includes new features, better plugin compatibility, and enhanced server configuration options.
88

99
<!-- truncate -->
1010

1111
Posted in our Discord server announcements channel by kseny ([discord.gg/samp](https://discord.gg/samp))
1212

1313
Hello everyone
1414

15-
We have just released open.mp server beta 9, fixing several reported issues and adding several new features. The most notable change being - SA:MP 0.3DL support. You can now run 0.3.7 and 0.3.DL compatible servers from the same binary.
15+
We have just released open.mp server beta 9, fixing several reported issues and adding several new features. The most notable change being - SA:MP 0.3.DL support. You can now run 0.3.7 and 0.3.DL compatible servers from the same binary.
1616

1717
## Other Changes
1818

frontend/blog/2023-01-05-release-candidate-1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ A few terms to get you started, so you can start to understand what it is that y
9292

9393
- *Component* - A logical individual piece of the server, like objects or pickups. Ones you don't need don't need to be loaded.
9494
- *Extension* - Code that extends another bit of code. You can write component extensions, but the most common ones are player extensions, which define some structure of data to be associated with a player in addition to all their normal data like health and weapons.
95-
- *UID* - *U*nique *ID*entifier, a number that represents your component, and your component alone. This ia always required and can be got here: http://open.mp/uid
95+
- *UID* - *U*nique *ID*entifier, a number that represents your component, and your component alone. This ia always required and can be got here: https://open.mp/uid
9696
- *Entity* - A thing, usually a thing a player can interact with, and which you might have a lot of. Objects are entities, but other players are also entities, even commands in a processor could be called entities.
9797
- *Pool* - Something that holds entities. When you have a lot you need to be able to access them by name or ID in some way, this is what a pool does.
9898
- *Interface* - Components use an abstract base class as an interface. This declares which methods a component has, but doesn't contain the code for the methods. Interfaces are passed around so that components can communicate with each other, but implementations are kept private.

frontend/docs/awesome.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description: A curated list of useful tools, libraries, gamemodes, filterscripts
2424
- **[fixes.inc](https://github.com/pawn-lang/sa-mp-fixes)** - Extremely optmised fixes for a huge number of SA:MP server bugs. Plug-and-play.
2525
- **[YSI-Includes](https://github.com/pawn-lang/YSI-Includes)** - The oldest, largest, most tested, and well supported library for SA:MP/pawn, providing a huge number of new game and language features.
2626
- **[foreach](https://github.com/Open-GTO/foreach)** - foreach standalone include (non y_iterate version).
27-
- **[amx_assembly](https://github.com/Zeex/amx_assembly)** - Low-level access to the pawn script itself.
27+
- **[amx_assembly](https://github.com/pawn-lang/amx_assembly)** - Low-level access to the pawn script itself.
2828
- **[md-sort](https://github.com/oscar-broman/md-sort)** - Sort multi-dimensional arrays in Pawn. Modifies the array's internal pointers instead of copying around data.
2929
- **[indirection](https://github.com/Y-Less/indirection)** - System for passing pointers and calling functions indirectly, with abstract methods to customise calls.
3030
- **[code-parse.inc](https://github.com/Y-Less/code-parse.inc)** - Parse and customise pawn code at compile-time.
@@ -69,9 +69,9 @@ description: A curated list of useful tools, libraries, gamemodes, filterscripts
6969

7070
## Plugins
7171

72-
- **[JIT](https://github.com/Zeex/samp-plugin-jit)** - Once your code is stable, use this to speed it up significantly.
73-
- **[CrashDetect](https://github.com/Zeex/samp-plugin-crashdetect)** - Development tool to find bugs during testing.
74-
- **[Profiler](https://github.com/Zeex/samp-plugin-profiler)** - Performance profiler plugin for SA-MP server.
72+
- **[JIT](https://github.com/Foundation-PAWN/samp-plugin-jit-backup)** - Once your code is stable, use this to speed it up significantly.
73+
- **[CrashDetect](https://github.com/AmyrAhmady/samp-plugin-crashdetect)** - Development tool to find bugs during testing.
74+
- **[Profiler](https://github.com/Foundation-PAWN/samp-plugin-profiler-backup)** - Performance profiler plugin for SA-MP server.
7575
- **[sscanf](https://github.com/Y-Less/sscanf)** - Convert strings to multiple values, ints, floats, players, etc.
7676
- **[MySQL Plugin](https://github.com/pBlueG/SA-MP-MySQL)** - Connect your server to a MySQL server.
7777
- **[Streamer Plugin](https://github.com/samp-incognito/samp-streamer-plugin)** - Bypass many SA:MP limits, like objects and pickups.
@@ -129,8 +129,8 @@ description: A curated list of useful tools, libraries, gamemodes, filterscripts
129129

130130
Now you can make your scripts in languages other than pawn without any plugin using open.mp. See [this blog post](https://www.open.mp/blog/release-candidate-1)
131131

132-
- **[sampsdk](https://github.com/Zeex/samp-plugin-sdk)** - This is the bare minium that you need to develop plugins.
133-
- **[sampgdk](https://github.com/Zeex/sampgdk)** - C/C++ Language Support for writing a gamemode for SA:MP
132+
- **[sampsdk](https://github.com/maddinat0r/samp-plugin-sdk)** - This is the bare minimum that you need to develop plugins.
133+
- **[sampgdk](https://github.com/Foundation-PAWN/sampgdk-backup)** - C/C++ Language Support for writing a gamemode for SA:MP
134134
- **[SampSharp](https://github.com/ikkentim/SampSharp)** - C# Language Support for writing a gamemode for SA:MP
135135
- **[.NET Plugin](https://github.com/Seregamil/.NET-plugin)** - C# Language Support for writing a plugin for SA:MP
136136
- **[sampgo](https://github.com/sampgo/sampgo)** - Go Language Support for writing a gamemode/plugins for SA:MP

frontend/docs/changelog.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,10 @@ Release Candidate 2 (RC2) of the open.mp server.
506506
- [OnPlayerEnterPlayerGangZone](scripting/callbacks/OnPlayerEnterPlayerGangZone)
507507
- [OnPlayerLeavePlayerGangZone](scripting/callbacks/OnPlayerLeavePlayerGangZone)
508508
- [OnPlayerClickPlayerGangZone](scripting/callbacks/OnPlayerClickPlayerGangZone)
509-
- [OnPickupStreamIn](../scripting/callbacks/OnPickupStreamIn)
510-
- [OnPickupStreamOut](../scripting/callbacks/OnPickupStreamOut)
511-
- [OnPlayerPickUpPlayerPickup](../scripting/callbacks/OnPlayerPickUpPlayerPickup)
512-
- [OnPlayerPickupStreamIn](../scripting/callbacks/OnPlayerPickupStreamIn)
513-
- [OnPlayerPickupStreamOut](../scripting/callbacks/OnPlayerPickupStreamOut)
509+
- [OnPickupStreamIn](scripting/callbacks/OnPickupStreamIn)
510+
- [OnPickupStreamOut](scripting/callbacks/OnPickupStreamOut)
511+
- [OnPlayerPickUpPlayerPickup](scripting/callbacks/OnPlayerPickUpPlayerPickup)
512+
- [OnPlayerPickupStreamIn](scripting/callbacks/OnPlayerPickupStreamIn)
513+
- [OnPlayerPickupStreamOut](scripting/callbacks/OnPlayerPickupStreamOut)
514514

515515
</details>

frontend/docs/client/ClientOnLinux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ You DO NOT get a working GUI, this must be executed in a Wine prefix via command
2121

2222
1. Ensure you have a Wine prefix created with GTA San Andreas installed.
2323
2. Download the [open.mp](https://github.com/openmultiplayer/launcher/releases/latest) launcher and install it inside the Wine prefix.
24-
3. Download the [SA-MP client](https://github.com/KrustyKoyle/files.sa-mp.com-Archive) and install it in the same Wine Prefix.
24+
3. Download the [SA-MP client](https://www.sa-mp.mp/downloads/) and install it in the same Wine Prefix.
2525
4. Download the [omp-client.dll](https://assets.open.mp/omp-client.dll) and copy it to the `AppData\Local\mp.open.launcher\omp\` folder of the main user in your prefix.
2626

2727
Finally, you can execute the open.mp launcher through the Wine prefixes CLI or write it to a .bat script for easy launching.

frontend/docs/client/CommonClientIssues.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_label: Common Client Issues
55

66
### I get the error "San Andreas cannot be found"
77

8-
San Andreas Multiplayer is **not** a stand-alone program! It adds multiplayer functionality to San Andreas, and thus you need GTA San Andreas for the PC - it also needs to be **EU/US v1.0**, other versions such as v2.0 or Steam and Direct2Drive versions will not work. [Click here to download a patch to downgrade your GTA: SA version to 1.0](http://grandtheftauto.filefront.com/file/GTA_SA_Downgrader_Patch;74661)
8+
San Andreas Multiplayer is **not** a stand-alone program! It adds multiplayer functionality to San Andreas, and thus you need GTA San Andreas for the PC - it also needs to be **EU/US v1.0**, other versions such as v2.0 or Steam and Direct2Drive versions will not work. [Click here to download a patch to downgrade your GTA: SA version to 1.0](https://www.gamefront.com/games/grand-theft-auto-san-andreas/file/gta-sa-downgrader-patch)
99

1010
### I cannot see any servers in SA:MP browser
1111

@@ -20,7 +20,7 @@ You are not supposed to see the singleplayer options (new game, load game, etc)
2020

2121
:::
2222

23-
Singleplayer can load for 2 reasons; you have installed SA:MP to the wrong folder or you have the wrong version of San Andreas. If you have the wrong version you can downgrade your game using the GTA San Andreas downgrader. Click [here](http://grandtheftauto.filefront.com/file/GTA_SA_Downgrader_Patch;74661) to download it.
23+
Singleplayer can load for 2 reasons; you have installed SA:MP to the wrong folder or you have the wrong version of San Andreas. If you have the wrong version you can downgrade your game using the GTA San Andreas downgrader. Click [here](https://www.gamefront.com/games/grand-theft-auto-san-andreas/file/gta-sa-downgrader-patch) to download it.
2424

2525
Sometimes the single player menu will be shown, but SA:MP will in fact have loaded properly. To fix this you simply need to select an item on the menu, then hit the escape key to exit out of it. SA:MP will then proceed to load.
2626

@@ -50,7 +50,7 @@ If you have 2 monitors then there are 3 ways to solve this:
5050

5151
### My mouse doesn't work after exiting the pause menu
5252

53-
If your mouse seems to be frozen ingame while it (partially) works in the pause menu, then you should disable the multicore option [sa-mp.cfg](ClientCommands#file-sa-mpcfg "Sa-mp.cfg") (set it to 0). Continuously tapping Escape until the mouse responds again may also work, but it is not as neat a solution.
53+
If your mouse seems to be frozen ingame while it (partially) works in the pause menu, then you should disable the multicore option [sa-mp.cfg](ClientCommands#file-sa-mpcfg "sa-mp.cfg") (set it to 0). Continuously tapping Escape until the mouse responds again may also work, but it is not as neat a solution.
5454

5555
### The file dinput8.dll is missing
5656

0 commit comments

Comments
 (0)