Skip to content

Commit 764f5ab

Browse files
botderbotder
committed
Set version to 1.6.1
1 parent a79a764 commit 764f5ab

File tree

10 files changed

+23
-302
lines changed

10 files changed

+23
-302
lines changed

‎Client/launch/Multi Theft Auto.manifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:v3="urn:schemas-microsoft-com:asm.v3">
3-
<assemblyIdentity type="win32" version="1.6.0.0" processorArchitecture="*" name="Multi Theft Auto" />
3+
<assemblyIdentity type="win32" version="1.6.1.0" processorArchitecture="*" name="Multi Theft Auto" />
44

55
<v3:application>
66
<windowsSettings>

‎Client/launch/NEU/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.xml diff working-tree-encoding=UTF-16 eol=crlf

‎Client/launch/NEU/Multi Theft Auto.gdf.xml

-3.83 KB
Binary file not shown.

‎Client/launch/launch.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ IDI_ICON1 ICON "resource\\mtaicon.ico"
7171
//
7272

7373
VS_VERSION_INFO VERSIONINFO
74-
FILEVERSION 1,6,0,0
75-
PRODUCTVERSION 1,6,0,0
74+
FILEVERSION 1,6,1,0
75+
PRODUCTVERSION 1,6,1,0
7676
FILEFLAGSMASK 0x17L
7777
#ifdef _DEBUG
7878
FILEFLAGS 0x1L
@@ -89,10 +89,10 @@ BEGIN
8989
BEGIN
9090
VALUE "CompanyName", "Multi Theft Auto"
9191
VALUE "FileDescription", "Multi Theft Auto Launcher"
92-
VALUE "FileVersion", "1.6.0.0"
93-
VALUE "LegalCopyright", "(C) 2003 - 2023 Multi Theft Auto"
92+
VALUE "FileVersion", "1.6.1.0"
93+
VALUE "LegalCopyright", "(C) 2003 - 2025 Multi Theft Auto"
9494
VALUE "ProductName", "MTA San Andreas"
95-
VALUE "ProductVersion", "1.6.0.0"
95+
VALUE "ProductVersion", "1.6.1.0"
9696
END
9797
END
9898
BLOCK "VarFileInfo"

‎Server/mods/deathmatch/logic/CGame.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@
7878
#define MAX_EXPLOSION_SYNC_DISTANCE 400.0f
7979
#define MAX_PROJECTILE_SYNC_DISTANCE 400.0f
8080

81-
#define RELEASE_MIN_CLIENT_VERSION "1.6.0-0.00000"
82-
#define FIREBALLDESTRUCT_MIN_CLIENT_VERSION "1.6.0-9.22199"
81+
#define RELEASE_MIN_CLIENT_VERSION "1.6.1-0.00000"
8382

8483
#define DEFAULT_GRAVITY 0.008f
8584
#define DEFAULT_GAME_SPEED 1.0f
@@ -4888,12 +4887,6 @@ CMtaVersion CGame::CalculateMinClientRequirement()
48884887
if (strNewMin < strMinClientRequirementFromResources)
48894888
strNewMin = strMinClientRequirementFromResources;
48904889

4891-
if (!g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::FIREBALLDESTRUCT))
4892-
{
4893-
if (strNewMin < FIREBALLDESTRUCT_MIN_CLIENT_VERSION)
4894-
strNewMin = FIREBALLDESTRUCT_MIN_CLIENT_VERSION;
4895-
}
4896-
48974890
// Log effective min client version
48984891
if (strNewMin != m_strPrevMinClientConnectRequirement)
48994892
{
@@ -4915,12 +4908,6 @@ CMtaVersion CGame::CalculateMinClientRequirement()
49154908
{
49164909
CMtaVersion strKickMin;
49174910

4918-
if (!g_pGame->IsWorldSpecialPropertyEnabled(WorldSpecialProperty::FIREBALLDESTRUCT))
4919-
{
4920-
if (strKickMin < FIREBALLDESTRUCT_MIN_CLIENT_VERSION)
4921-
strKickMin = FIREBALLDESTRUCT_MIN_CLIENT_VERSION;
4922-
}
4923-
49244911
if (strKickMin != m_strPrevMinClientKickRequirement)
49254912
{
49264913
m_strPrevMinClientKickRequirement = strKickMin;

‎Server/mods/deathmatch/logic/CResourceChecker.Data.h

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -22,57 +22,13 @@ namespace
2222
};
2323

2424
SVersionItem clientFunctionInitList[] = {
25-
// Features added in 1.6.0
26-
{"getAllElementData", "1.6.0-9.21695"},
27-
{"engineLoadIMG", "1.6.0-9.21695"},
28-
{"engineImageLinkDFF", "1.6.0-9.21695"},
29-
{"engineImageLinkTXD", "1.6.0-9.21695"},
30-
{"engineRestoreDFFImage", "1.6.0-9.21695"},
31-
{"engineRestoreTXDImage", "1.6.0-9.21695"},
32-
{"engineAddImage", "1.6.0-9.21695"},
33-
{"engineRemoveImage", "1.6.0-9.21695"},
34-
{"engineImageGetFilesCount", "1.6.0-9.21695"},
35-
{"engineImageGetFiles", "1.6.0-9.21695"},
36-
{"engineImageGetFile", "1.6.0-9.21695"},
37-
{"engineGetModelTXDID", "1.6.0-9.21695"},
38-
{"engineSetModelFlags", "1.6.0-9.21695"},
39-
{"engineGetModelFlags", "1.6.0-9.21695"},
40-
{"engineResetModelFlags", "1.6.0-9.21695"},
41-
{"engineGetModelFlag", "1.6.0-9.21695"},
42-
{"engineSetModelFlag", "1.6.0-9.21695"},
43-
{"fileGetContents", "1.6.0-9.21938"},
44-
{"fileGetHash", "1.6.0-9.23289"},
45-
{"engineStreamingSetModelCacheLimits", "1.6.0-9.21946"},
46-
{"engineStreamingRestoreBufferSize", "1.6.0-9.22195"},
47-
{"createBuilding", "1.6.0-9.22410"},
48-
{"restoreAllGameBuildings", "1.6.0-9.22420"},
49-
{"removeAllGameBuildings", "1.6.0-9.22420"},
50-
{"pathListDir", "1.6.0-9.22470"},
51-
{"pathIsFile", "1.6.0-9.22470"},
52-
{"pathIsDirectory", "1.6.0-9.22470"},
53-
{"engineGetPoolCapacity", "1.6.0-9.22471"},
54-
{"engineGetPoolDefaultCapacity", "1.6.0-9.22471"},
55-
{"engineGetPoolUsedCapacity", "1.6.0-9.22471"},
56-
{"engineSetPoolCapacity", "1.6.0-9.22471"},
25+
// Features added in 1.6.1
26+
// {"name", "1.6.1-9.bbbbb"},
5727
};
5828

5929
SVersionItem serverFunctionInitList[] = {
60-
// Features added in 1.6.0
61-
{"isObjectBreakable", "1.6.0-9.21765"},
62-
{"setObjectBreakable", "1.6.0-9.21765"},
63-
{"fileGetContents", "1.6.0-9.21938"},
64-
{"fileGetHash", "1.6.0-9.23289"},
65-
{"isWorldSpecialPropertyEnabled", "1.6.0-9.22195"},
66-
{"setWorldSpecialPropertyEnabled", "1.6.0-9.22195"},
67-
{"onResourceStateChange", "1.6.0-9.22430"},
68-
{"isObjectMoving", "1.6.0-9.22457"},
69-
{"onPlayerTriggerInvalidEvent", "1.6.0-9.22459"},
70-
{"pathListDir", "1.6.0-9.22470"},
71-
{"pathIsFile", "1.6.0-9.22470"},
72-
{"pathIsDirectory", "1.6.0-9.22470"},
73-
{"onAccountCreate", "1.6.0-9.22470"},
74-
{"onAccountRemove", "1.6.0-9.22470"},
75-
{"getAccountType", "1.6.0-9.22470"},
30+
// Features added in 1.6.1
31+
// {"name", "1.6.1-9.bbbbb"},
7632
};
7733

7834
//

‎Shared/data/data files installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Var Install_Dir
1717
!ifndef MAJOR_VER
1818
!define MAJOR_VER "1"
1919
!define MINOR_VER "6"
20-
!define MAINT_VER "0"
20+
!define MAINT_VER "1"
2121
!endif
2222
!define 0.0 "${MAJOR_VER}.${MINOR_VER}"
2323
!define 0.0.0 "${MAJOR_VER}.${MINOR_VER}.${MAINT_VER}"

‎Shared/installer/nightly.nsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ Var ServerExePath
5151
Var UninstallExePath
5252

5353
; Games explorer: With each new X.X, update this GUID and the file at MTA10\launch\NEU\Multi Theft Auto.gdf.xml
54-
!define GUID "{119D0ADB-56AF-4C85-9037-26564C0ACD57}"
54+
!define GUID "{8A7FC5C7-0023-4CD7-B1D6-89073CFD838F}"
5555

5656

5757
!ifndef MAJOR_VER
5858
!define MAJOR_VER "1"
5959
!define MINOR_VER "6"
60-
!define MAINT_VER "0"
60+
!define MAINT_VER "1"
6161
!endif
6262
!define 0.0 "${MAJOR_VER}.${MINOR_VER}"
6363
!define 0.0.0 "${MAJOR_VER}.${MINOR_VER}.${MAINT_VER}"

‎Shared/sdk/net/bitstream.h

Lines changed: 4 additions & 227 deletions
Original file line numberDiff line numberDiff line change
@@ -399,234 +399,11 @@ class NetBitStreamInterfaceNoVersion : public CRefCountable
399399
// Make sure you only add new items to the end of the list, above the "Latest" entry.
400400
enum class eBitStreamVersion : unsigned short
401401
{
402-
Unk = 0x062,
402+
Unk = 0x030,
403403

404-
//
405-
// 1.5.0 UNSTABLE - 2015-01-17
406-
//
407-
408-
// Add "quickstand" to setGlitchEnabled
409-
// 2015-07-13 0x063 209837dcdc30d267519abc12e1361a1d18cd1553
410-
QuickStandGlitch,
411-
412-
//
413-
// 1.5.0 RC RELEASED - 2015-07-15
414-
//
415-
416-
//
417-
// 1.5.1 RELEASED - 2015-11-05
418-
//
419-
420-
// Update fix #9038 (bugged shotgun with bullet sync) to only work if all connected clients support it
421-
// 2015-10-17 0x064 edbc6d37a734914b7349c693edf9a087a5a78a3d
422-
ShotgunDamageFix,
423-
424-
//
425-
// 1.5.2 RELEASED - 2016-01-24
426-
//
427-
428-
// Add blend parameter to setPedAnimation (#62)
429-
// 2016-09-05 0x065 f51983c3e3385b4de8d754e11efe329acaee9301
430-
SetPedAnimation_Blend,
431-
432-
// Update net module version
433-
// 2016-09-24 0x066 3de7e5bd2d425747617a24350f2974e02cddc6dc
434-
NetUpdate_0x09E,
435-
436-
//
437-
// 1.5.3 RELEASED - 2016-10-20
438-
//
439-
440-
// Fix player nametag unicode characters missing on player join
441-
// 2016-12-09 0x067 2e582453b476c1183bd9fae5363a7cffdb531834
442-
UnicodeNametags,
443-
444-
// Add -1 parameter to setElementDimension (only to objects) (#111)
445-
// 2017-02-22 0x068 2e319aa823929360da9e1f48c7eb233f1d6f29e5
446-
DimensionOmnipresence,
447-
448-
// Add support for more special detections
449-
// 2017-02-26 0x069 9b6187b3c2eaa655624254f8d83acb35b31243e7
450-
MoreSpecialDetections_Nice69,
451-
452-
// Add option to enable fakelag command for testing sync issues
453-
// 2017-03-08 0x06A a99fa0afa3b55e84f15aed335ab542520f39126d
454-
FakeLagCommand,
455-
456-
//
457-
// 1.5.4 RELEASED - 2017-04-17
458-
//
459-
460-
// Add player element for onClientChatMessage (#138)
461-
// 2017-07-04 0x06B 8c7095599c6d54784692bf93a1e6c7f56392c323
462-
OnClientChatMessage_PlayerSource,
463-
464-
//
465-
// 1.5.5 RELEASED - 2017-08-07
466-
//
467-
468-
// Add bShallow argument for server-side water as well (#240)
469-
// 2018-08-05 0x06C 1321b538559efe6d70deb5b784c2d392d52658f5
470-
Water_bShallow_ServerSide,
471-
472-
//
473-
// 1.5.6 RELEASED - 2018-09-07
474-
// 1.5.7 RELEASED - 2019-08-31
475-
//
476-
477-
// Add option to disable spawning components by setVehicleDoorState
478-
// 2019-10-11 0x06D e79d97195439f70ac66ece1859152b4c4896af31
479-
SetVehicleDoorState_SpawnFlyingComponent,
480-
481-
// Increment BitStream version for Discord update (#1330)
482-
// 2020-03-27 0x06E a0ce68f284487ba636e839b06c103bc2442d95e0
483-
Discord_InitialImplementation,
484-
485-
// Add analog control sync for accelerate and brake_reverse (#1164)
486-
// 2020-04-02 0x06F 41e36cc67520dded2a5203727a726c4261c65e31
487-
AnalogControlSync_AccelBrakeReverse,
488-
489-
//
490-
// 1.5.8 RELEASED - 2020-10-11
491-
//
492-
493-
// setWaterLevel: add bIncludeWorldSeaLevel and bIncludeOutsideWorldLevel
494-
// 2020-11-03 0x70
495-
SetWaterLevel_ChangeOutsideWorldLevel,
496-
497-
// Implement entering/exiting/jacking for peds #1748
498-
// 2020-11-10 0x71
499-
PedEnterExit,
500-
501-
// Add height for colpolygon (#1908)
502-
// 2021-01-16 0x72
503-
SetColPolygonHeight,
504-
505-
// Support for vehicle blow without explosion and blow state synchronisation
506-
// 2021-02-26 0x73
507-
VehicleBlowStateSupport,
508-
509-
// Implement messageType parameter to onClientChatMessage (#1020)
510-
// 2021-05-15 0x74
511-
OnClientChatMessage_MessageType,
512-
513-
// Add serverside event "onPlayerResourceStart" (#2150)
514-
// 2021-08-30 0x75
515-
OnPlayerResourceStart,
516-
517-
//
518-
// 1.5.9 RELEASED - 2021-10-01
519-
//
520-
521-
// Remove "old" Discord implementation (#2499)
522-
// 2022-01-16 0x76
523-
Discord_Cleanup,
524-
525-
//
526-
// 1.6.0 RELEASED - 2023-04-07
527-
//
528-
529-
CEntityAddPacket_ObjectBreakable,
530-
531-
// Add serverside setWorldSpecialPropertyEnabled
532-
// 2023-08-17
533-
WorldSpecialProperties,
534-
535-
// Add "fireballdestruct" to setWorldSpecialPropertyEnabled
536-
// 2023-09-09
537-
WorldSpecialProperty_FireballDestruct,
538-
539-
// Send server name to player in CPlayerJoinCompletePacket
540-
// 2023-10-12
541-
CPlayerJoinCompletePacket_ServerName,
542-
543-
// Add "roadsignstext" to setWorldSpecialPropertyEnabled
544-
// 2024-05-17
545-
WorldSpecialProperty_RoadSignsText,
546-
547-
// Add "extendedwatercannons" to setWorldSpecialPropertyEnabled
548-
// 2024-05-23
549-
WorldSpecialProperty_ExtendedWaterCannons,
550-
551-
// Add breakObject to serverside as well
552-
// 2024-05-31
553-
BreakObject_Serverside,
554-
555-
// Ped syncronization revision
556-
// 2024-06-16
557-
PedSync_Revision,
558-
559-
// Add "tunnelweatherblend" to setWorldSpecialPropertyEnabled
560-
// 2024-06-30
561-
WorldSpecialProperty_TunnelWeatherBlend,
562-
563-
// Checkpoint & arrow alpha fix
564-
// 2024-07-03
565-
Marker_IgnoreAlphaLimits,
566-
567-
// Add "setMarkerTargetArrowProperties"
568-
// 2024-07-05
569-
SetMarkerTargetArrowProperties,
570-
571-
// Add respawnObject and toggleObjectRespawn to serverside
572-
// 2024-09-04
573-
RespawnObject_Serverside,
574-
575-
// Add check_duplicate_serials
576-
// 2024-09-04
577-
CheckDuplicateSerials,
578-
579-
// Add ignorefirestate special world property
580-
// 2024-11-07
581-
WorldSpecialProperty_IgnoreFireState,
582-
583-
// Fix iPedSyncerDistance and iUnoccupiedVehicleSyncerDistance sync
584-
// 2024-11-22
585-
FixSyncerDistance,
586-
587-
// Add onPlayerChangesWorldSpecialProperty
588-
// 2024-11-26
589-
WorldSpecialPropertyEvent,
590-
591-
// Add setElementOnFire function
592-
// 2024-12-30
593-
SetElementOnFire,
594-
595-
// Add "spawnFlyingComponent" to setVehiclePanelState
596-
// 2024-12-31
597-
SetVehiclePanelState_SpawnFlyingComponent,
598-
599-
// Ped animations synchronization
600-
// 2025-01-01
601-
AnimationsSync,
602-
603-
// Add server side isPedReloadingWeapon
604-
// 2025-01-09
605-
IsPedReloadingWeapon,
606-
607-
// Add "flyingcomponents" to setWorldSpecialPropertyEnabled
608-
// 2025-01-10
609-
WorldSpecialProperty_FlyingComponents,
610-
611-
// Ped's camera synchronization
612-
// 2025-01-29
613-
PedSync_CameraRotation,
614-
615-
// Add "vehicleburnexplosions" to setWorldSpecialPropertyEnabled
616-
// 2025-02-20
617-
WorldSpecialProperty_VehicleBurnExplosions,
618-
619-
// Add serverside building support
620-
// 2025-05-26
621-
ServersideBuildingElement,
622-
623-
// Add "vehenginemanualmode" to setWorldSpecialPropertyEnabled
624-
// 2025-06-02
625-
WorldSpecialProperty_VehicleEngineAutoStart,
626-
627-
// Add "vehicle_rapid_stop" to setGlitchEnabled
628-
// 2025-06-05
629-
Glitch_VehicleRapidStop,
404+
// DESCRIPTION
405+
// YYYY-MM-DD
406+
// Name,
630407

631408
// This allows us to automatically increment the BitStreamVersion when things are added to this enum.
632409
// Make sure you only add things above this comment.

0 commit comments

Comments
 (0)