Skip to content

Commit edd1039

Browse files
authored
Merge branch 'openmultiplayer:master' into patch-1
2 parents 7bc5c5a + b2a94bd commit edd1039

File tree

69 files changed

+8733
-888
lines changed

Some content is hidden

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

69 files changed

+8733
-888
lines changed

app/transports/api/launcher/api.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,20 @@ 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+
},
4653
}
4754

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

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/server/CommonServerIssues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_label: Common Server Issues
55

66
## Server instantly crashes when started
77

8-
Most commonly it's an error in your server.cfg file or your gamemode is missing. Check the server_log.txt file and the reason should be located at the bottom. If not, check crashinfo.txt file. The better solution to find out what is causing the crash is using the Crash detect plugin by Zeex/0x5A656578 ([click for link](https://github.com/Y-Less/samp-plugin-crashdetect)) which will give more information like line numbers, function names, parameter values, etc. If the script is compiled in debug mode (-d3 flag) to make compiler put extra information about all that stuff into the output .amx.
8+
Most commonly it's an error in your server.cfg file or your gamemode is missing. Check the server_log.txt file and the reason should be located at the bottom. If not, check crashinfo.txt file. The better solution to find out what is causing the crash is using the Crash detect plugin by Zeex/0x5A656578 ([click for link](https://github.com/AmyrAhmady/samp-plugin-crashdetect)) which will give more information like line numbers, function names, parameter values, etc. If the script is compiled in debug mode (-d3 flag) to make compiler put extra information about all that stuff into the output .amx.
99

1010
## Server is not working - firewall is disabled
1111

frontend/docs/tutorials/PluginDevelopmentGuide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Here are the downloads you'll need for this section:
7474

7575
**Visual C++ 2010 express:** [Free download](https://visualstudio.microsoft.com/vs/express/)
7676

77-
**Plugin SDK (Plain):** [Download](https://github.com/Zeex/samp-plugin-sdk)
77+
**Plugin SDK (Plain):** [Download](https://github.com/maddinat0r/samp-plugin-sdk)
7878

7979
- The first thing we want to do is create a new project. Select file->new->project to do just that.
8080

frontend/i18n/bs/docusaurus-plugin-content-docs/current/awesome.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description: Kursirana lista korisnih alata, biblioteka i plugina za SA-MP devel
2424
- **[fixes.inc](https://github.com/pawn-lang/sa-mp-fixes)** - Izuzetno optimizirani popravci za veliki broj programskih pogrešaka SA:MP. Uključi i igraj.
2525
- **[YSI-Includes](https://github.com/pawn-lang/YSI-Includes)** - Najstariji, najveći i najviše testirani, dobro podržani library za SA:MP/pawn koji nudi ogroman broj novih značajki igre i jezika.
2626
- **[foreach](https://github.com/Open-GTO/foreach)** - foreach samostalni include (verzija koja nije y_iterate).
27-
- **[amx_assembly](https://github.com/Zeex/amx_assembly)** - Pristup niske razine samoj založnoj skripti.
27+
- **[amx_assembly](https://github.com/pawn-lang/amx_assembly)** - Pristup niske razine samoj založnoj skripti.
2828
- **[md-sort](https://github.com/oscar-broman/md-sort)** - Sortiraj višedimenzionalne nizove u Pawn-u. Modificira interne pokazivače niza umjesto kopiranja podataka.
2929
- **[indirection](https://github.com/Y-Less/indirection)** - Sustav za neizravno prosljeđivanje pokazivača i pozivanje funkcija, sa apstraktnim metodama za prilagodbu poziva.
3030
- **[code-parse.inc](https://github.com/Y-Less/code-parse.inc)** - Analizirajte i prilagodite založni kod u vrijeme kompajlanja.
@@ -67,9 +67,9 @@ description: Kursirana lista korisnih alata, biblioteka i plugina za SA-MP devel
6767

6868
## Plugini
6969

70-
- **[JIT](https://github.com/Zeex/samp-plugin-jit)** - Nakon što je vaš kod stabilan, upotrijebite ga da biste ga znatno ubrzali.
71-
- **[CrashDetect](https://github.com/Y-Less/samp-plugin-crashdetect)** - Razvojni alat za pronalaženje bugova tijekom testiranja.
72-
- **[Profiler](https://github.com/Zeex/samp-plugin-profiler)** - Plugin za profilisanje performansi za SA-MP server.
70+
- **[JIT](https://github.com/Foundation-PAWN/samp-plugin-jit-backup)** - Nakon što je vaš kod stabilan, upotrijebite ga da biste ga znatno ubrzali.
71+
- **[CrashDetect](https://github.com/AmyrAhmady/samp-plugin-crashdetect)** - Razvojni alat za pronalaženje bugova tijekom testiranja.
72+
- **[Profiler](https://github.com/Foundation-PAWN/samp-plugin-profiler-backup)** - Plugin za profilisanje performansi za SA-MP server.
7373
- **[sscanf](https://github.com/Y-Less/sscanf)** - Pretvori nizove u više vrijednosti, intove, plutajuće, playere itd.
7474
- **[MySQL Plugin](https://github.com/pBlueG/SA-MP-MySQL)** - Konektujte svoj server sa MySQL serverom.
7575
- **[Streamer Plugin](https://github.com/samp-incognito/samp-streamer-plugin)** - Zaobiđite mnoga SA:MP ograničenja, poput predmeta i preuzimanja.
@@ -123,8 +123,8 @@ description: Kursirana lista korisnih alata, biblioteka i plugina za SA-MP devel
123123

124124
Sada možete napraviti svoje skripte na drugim jezicima osim pawn-a bez ikakvog plugina koristeći open.mp. Pogledajte [ovaj blog post](https://www.open.mp/blog/release-candidate-1)
125125

126-
- **[sampsdk](https://github.com/Zeex/samp-plugin-sdk)** - Ovo je minimum koji vam je potreban za razvoj dodataka.
127-
- **[sampgdk](https://github.com/Zeex/sampgdk)** - Podrška jezika C/C++ za pisanje gamemode-a za SA:MP.
126+
- **[sampsdk](https://github.com/maddinat0r/samp-plugin-sdk)** - Ovo je minimum koji vam je potreban za razvoj dodataka.
127+
- **[sampgdk](https://github.com/Foundation-PAWN/sampgdk-backup)** - Podrška jezika C/C++ za pisanje gamemode-a za SA:MP.
128128
- **[SampSharp](https://github.com/ikkentim/SampSharp)** - Podrška jezika C# za pisanje gamemode-a za SA:MP.
129129
- **[.NET Plugin](https://github.com/Seregamil/.NET-plugin)** - Podrška jezika C# za pisanje plugina za SA:MP.
130130
- **[sampgo](https://github.com/sampgo/sampgo)** - Go jezična podrška za pisanje gamemode-a/plugina za SA:MP.

frontend/i18n/bs/docusaurus-plugin-content-docs/current/changelog.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ Release Candidate 2 (RC2) open.mp servera.
466466
- [OnPlayerEnterPlayerGangZone](scripting/callbacks/OnPlayerEnterPlayerGangZone)
467467
- [OnPlayerLeavePlayerGangZone](scripting/callbacks/OnPlayerLeavePlayerGangZone)
468468
- [OnPlayerClickPlayerGangZone](scripting/callbacks/OnPlayerClickPlayerGangZone)
469-
- [OnPickupStreamIn](../scripting/callbacks/OnPickupStreamIn)
470-
- [OnPickupStreamOut](../scripting/callbacks/OnPickupStreamOut)
471-
- [OnPlayerPickUpPlayerPickup](../scripting/callbacks/OnPlayerPickUpPlayerPickup)
472-
- [OnPlayerPickupStreamIn](../scripting/callbacks/OnPlayerPickupStreamIn)
473-
- [OnPlayerPickupStreamOut](../scripting/callbacks/OnPlayerPickupStreamOut)
469+
- [OnPickupStreamIn](scripting/callbacks/OnPickupStreamIn)
470+
- [OnPickupStreamOut](scripting/callbacks/OnPickupStreamOut)
471+
- [OnPlayerPickUpPlayerPickup](scripting/callbacks/OnPlayerPickUpPlayerPickup)
472+
- [OnPlayerPickupStreamIn](scripting/callbacks/OnPlayerPickupStreamIn)
473+
- [OnPlayerPickupStreamOut](scripting/callbacks/OnPlayerPickupStreamOut)
474474

475475
</details>

frontend/i18n/es/docusaurus-plugin-content-docs/current/awesome.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ description: Una lista de herramientas, librerías y plugins útiles para desarr
2222
- **_[SA:MP stdlib](https://github.com/pawn-lang/samp-stdlib)_** - Includes por defecto actualizados, con valores constantes, documentados, y completos.
2323
- **_[fixes.inc](https://github.com/pawn-lang/sa-mp-fixes)_** - Plug-and-play. Arreglos y optimización para un gran número de errores en los servidores de SA:MP. Plug And Play.
2424
- **_[YSI](https://github.com/pawn-lang/YSI-Includes)_** - La más vieja, extensa, probada, y adaptada libería para SA:MP/Pawn, proveyéndonos un gran número de nuevas características del lenguaje y del juego.
25-
- **_[amx_assembly](https://github.com/Zeex/amx_assembly)_** - Acceso al bajo nivel del mismo script de Pawn.
25+
- **_[amx_assembly](https://github.com/pawn-lang/amx_assembly)_** - Acceso al bajo nivel del mismo script de Pawn.
2626
- **_[md-sort](https://github.com/oscar-broman/md-sort)_** - Ordena arrays multidimensionales en Pawn. Modifica los punteros internos de la matriz en lugar de copiar los datos.
2727
- **_[indirection](https://github.com/Y-Less/indirection)_** - Sistema para pasar punteros y llamar funciones indirectamente, con métodos abstractos para customizar llamadas.
2828
- **_[code-parse.inc](https://github.com/Y-Less/code-parse.inc)_** - Analizar y customizar código Pawn al momento de compilación.
@@ -64,9 +64,9 @@ description: Una lista de herramientas, librerías y plugins útiles para desarr
6464

6565
## Plugins
6666

67-
- **_[JIT](https://github.com/Zeex/samp-plugin-jit)_** - Una vez que tu código sea estable, utiliza esto para acelerarlo significativamente.
68-
- **_[crashdetect](https://github.com/Y-Less/samp-plugin-crashdetect)_** - Herramienta de desarrollo para encontrar bugs durante el testeo.
69-
- **_[Profiler](https://github.com/Zeex/samp-plugin-profiler)_** - Plugin de perfil de rendimiento para el servidor SA-MP.
67+
- **_[JIT](https://github.com/Foundation-PAWN/samp-plugin-jit-backup)_** - Una vez que tu código sea estable, utiliza esto para acelerarlo significativamente.
68+
- **_[crashdetect](https://github.com/AmyrAhmady/samp-plugin-crashdetect)_** - Herramienta de desarrollo para encontrar bugs durante el testeo.
69+
- **_[Profiler](https://github.com/Foundation-PAWN/samp-plugin-profiler-backup)_** - Plugin de perfil de rendimiento para el servidor SA-MP.
7070
- **_[sscanf](https://github.com/Y-Less/sscanf)_** - Convierte strings en múltiples valores, enteros, flotantes, jugadores, etcétera.
7171
- **_[MySQL](https://github.com/pBlueG/SA-MP-MySQL)_** - Enlaza tu servidor a un servidor MySQL.
7272
- **_[streamer](https://github.com/samp-incognito/samp-streamer-plugin)_** - Sobrepasa los límites de objetos y pickups.
@@ -120,8 +120,8 @@ description: Una lista de herramientas, librerías y plugins útiles para desarr
120120

121121
Ahora puedes hacer tus scripts en otros lenguajes que no sean pawn sin ningun plugin usando open.mp. Ver [esta entrada de blog](https://www.open.mp/blog/release-candidate-1).
122122

123-
- **[sampsdk](https://github.com/Zeex/samp-plugin-sdk)** - Esto es lo mínimo que se necesita para desarrollar plugins.
124-
- **[sampgdk](https://github.com/Zeex/sampgdk)** - Lenguaje C/C++ para escribir un gamemode para SA:MP
123+
- **[sampsdk](https://github.com/maddinat0r/samp-plugin-sdk)** - Esto es lo mínimo que se necesita para desarrollar plugins.
124+
- **[sampgdk](https://github.com/Foundation-PAWN/sampgdk-backup)** - Lenguaje C/C++ para escribir un gamemode para SA:MP
125125
- **[SampSharp](https://github.com/ikkentim/SampSharp)** - Soporte de lenguaje C# para escribir un gamemode para SA:MP
126126
- **[.NET Plugin](https://github.com/Seregamil/.NET-plugin)** - Soporte de lenguaje C# para escribir un plugin para SA:MP
127127
- **[sampgo](https://github.com/sampgo/sampgo)** - Soporte de lenguaje Go para escribir un gamemode/plugin para SA:MP

frontend/i18n/es/docusaurus-plugin-content-docs/current/server/CommonServerIssues.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_label: Problemas Comunes
55

66
## El servidor se bloquea instantáneamente al iniciarse
77

8-
Lo más común es que se deba a un error en tu archivo server.cfg o a la falta de un gamemode. Verifica el archivo server_log.txt y la razón debería estar ubicada en la parte inferior. Si no está ahí, verifica el archivo crashinfo.txt. La mejor solución para descubrir qué está causando el bloqueo es utilizar el plugin Crash Detect de Zeex/0x5A656578 ([clic aquí para acceder](https://github.com/Y-Less/samp-plugin-crashdetect)), que proporcionará más información, como números de línea, nombres de función, valores de parámetros, etc. Si el script está compilado en modo de depuración (-d3 flag) para que el compilador incluya información adicional en el archivo .amx de salida.
8+
Lo más común es que se deba a un error en tu archivo server.cfg o a la falta de un gamemode. Verifica el archivo server_log.txt y la razón debería estar ubicada en la parte inferior. Si no está ahí, verifica el archivo crashinfo.txt. La mejor solución para descubrir qué está causando el bloqueo es utilizar el plugin Crash Detect de Zeex/0x5A656578 ([clic aquí para acceder](https://github.com/AmyrAhmady/samp-plugin-crashdetect)), que proporcionará más información, como números de línea, nombres de función, valores de parámetros, etc. Si el script está compilado en modo de depuración (-d3 flag) para que el compilador incluya información adicional en el archivo .amx de salida.
99

1010
## El servidor no funciona: el firewall está desactivado
1111

0 commit comments

Comments
 (0)