Skip to content
This repository was archived by the owner on May 20, 2018. It is now read-only.

Server side npcs #124

Open
wants to merge 141 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
35156f2
Add Gitter badge
gitter-badger Jul 19, 2016
70c075d
Merge pull request #2 from gitter-badger/gitter-badge
Bluscream Jul 19, 2016
f06c70a
So much stuff o.O
Bluscream Jul 22, 2016
8034386
Merge branch 'master' of https://github.com/Bluscream/GTACoop
Bluscream Jul 22, 2016
1121a16
forgot to merge the readme
Bluscream Jul 22, 2016
9581e5c
Merge remote-tracking branch 'refs/remotes/Guad/master'
Bluscream Jul 22, 2016
65e694a
client updated
Bluscream Jul 22, 2016
70271a9
0.9.1
Bluscream Jul 22, 2016
7911e08
updated README
Bluscream Jul 22, 2016
5415c0e
0.9.2-pre
Bluscream Jul 23, 2016
20ca644
0.9.2-pre2
Bluscream Jul 23, 2016
1bdfea8
stuff
Bluscream Jul 25, 2016
9be2afb
stuff 2.0
Bluscream Jul 25, 2016
8499b62
removed useless color codes
Bluscream Jul 25, 2016
10a1fb6
broken version
Bluscream Jul 26, 2016
fc0dcd4
another broken version, don't try to compile
Bluscream Jul 28, 2016
ebcee11
fixed broken version, firewall still not workin
Bluscream Jul 28, 2016
abda0e7
stufffff
Bluscream Jul 28, 2016
27b483c
did some shit
Bluscream Jul 28, 2016
95ab46e
Updated dependencies (broke shit)
Bluscream Jul 28, 2016
bc9f058
push the limits
Bluscream Jul 28, 2016
bb3b61f
didn't really change anything but removed derived script from chat cl…
Jul 28, 2016
ff273f8
Merge pull request #3 from sollaholla/master
Bluscream Jul 28, 2016
623f7f1
fixed stuff
Bluscream Jul 28, 2016
7d58c07
fixed anticlone
Bluscream Jul 28, 2016
71e4731
0.9.3
Bluscream Aug 4, 2016
1d1bb74
push
Bluscream Aug 7, 2016
c0b32d7
Fix C# warnings about architecture mismatches between dependencies an…
soccermitchy Aug 8, 2016
610366f
Documentation for ChatData class
soccermitchy Aug 8, 2016
6f6ed3f
Fix architecture mismatch between deps and gtaserver...
soccermitchy Aug 8, 2016
9e4085c
Document GameServer.cs
soccermitchy Aug 8, 2016
16eaf8f
Document NativeData.cs
soccermitchy Aug 8, 2016
4338930
Document Program.cs
soccermitchy Aug 8, 2016
6d8707a
Document ServerScript.cs
soccermitchy Aug 8, 2016
b574a39
Document ServerSettings.cs
soccermitchy Aug 8, 2016
83d6c77
Ayy, finished documenting everything.... Documented VehicleData.cs
soccermitchy Aug 8, 2016
d859f23
Remove useless deps from projects that don't need it...
soccermitchy Aug 8, 2016
19b052a
Fixes to server script hooks, dependency fixes
soccermitchy Aug 8, 2016
613d0f7
Use latest version of tinymp's lidgren.network fork
soccermitchy Aug 9, 2016
b1ec248
New readme?
soccermitchy Aug 9, 2016
981e065
Merge pull request #6 from Bluscream/new-readme-proposal
Bluscream Aug 9, 2016
7d55c68
Fix indentation
soccermitchy Aug 9, 2016
c6dec8c
Remove code for getting IP/GeoIP at start of server... Also shorten a…
soccermitchy Aug 9, 2016
cb4003e
Merge branch 'master' of github.com:Bluscream/GTACoop into remove-sho…
soccermitchy Aug 9, 2016
b74226d
bullshit try catch
Bluscream Aug 9, 2016
903a295
added spaces lol
Bluscream Aug 9, 2016
b77658c
Merge origin/master to local master
soccermitchy Aug 9, 2016
b2f564a
Merge branch 'master' of github.com:Bluscream/GTACoop
soccermitchy Aug 9, 2016
ba12dcf
made some changes to the readme
Bluscream Aug 9, 2016
bdeb6c6
another readme update
Bluscream Aug 9, 2016
9cae448
Oh look, AppDomains. RIP me.
soccermitchy Aug 9, 2016
9d3e4a9
test commit
Bluscream Aug 9, 2016
00a3e07
Make AdminTools work with modified ServerScript class
soccermitchy Aug 9, 2016
723e80e
Make the already broken race gamemode work with modified ServerScript…
soccermitchy Aug 9, 2016
6cd1c80
added pullapprove
Bluscream Aug 9, 2016
9bedb88
Fix line endings
soccermitchy Aug 9, 2016
b7201ee
Finally have support for starting a server in a thread running in a n…
soccermitchy Aug 9, 2016
595fc46
Figured out how to do it without the separate marshal class.
soccermitchy Aug 10, 2016
0ba068c
Create InstanceSettings class for instance-wide settings
soccermitchy Aug 10, 2016
78b4fd5
Move threading to server manager.
soccermitchy Aug 10, 2016
4cfb537
Filterscript support in multiserver.
soccermitchy Aug 11, 2016
730c45c
Set up client to use new server constructor
soccermitchy Aug 11, 2016
0f2dbc8
Make it not set any default filterscripts
soccermitchy Aug 11, 2016
9018b2d
FUCK YEAH IT WORKS
soccermitchy Aug 11, 2016
89be521
Set up logging on GameServer
soccermitchy Aug 11, 2016
c60bf3f
Move GameServer to use loggers. Deprecate LogToConsole
soccermitchy Aug 11, 2016
7d6f7a2
Forgot about LogToConsole.
soccermitchy Aug 11, 2016
91c44d5
Aand missing semicolon.
soccermitchy Aug 11, 2016
7343265
Merge branch 'virtualservers'
soccermitchy Aug 11, 2016
f8f8c31
stuff
Bluscream Aug 18, 2016
5b151b8
Create .travis.yml
Bluscream Oct 30, 2016
61bf106
Update .travis.yml
Bluscream Oct 30, 2016
a48f477
Add files via upload
Bluscream Nov 9, 2016
7dc5161
Start workign on porting server to .NET Core
soccermitchy Dec 7, 2016
76b01f8
More stuff
soccermitchy Dec 7, 2016
2170a70
Start implementing Tick(), and add a few placeholder functions. Lots …
soccermitchy Dec 8, 2016
8b68d84
Implement connection requests
soccermitchy Dec 9, 2016
ce855f3
Visual Studio Code files
soccermitchy Dec 9, 2016
12acf93
Forgot to commit/push this yesterday. Implement GameServer.HandleClie…
soccermitchy Dec 13, 2016
c7a5cf9
Merge branch 'master' of github.com:Bluscream/GTACoOp
soccermitchy Dec 13, 2016
04050e8
some formatting stuff
soccermitchy Dec 13, 2016
1d4c2d3
Implement discovery response packets
soccermitchy Dec 13, 2016
a4fe2c3
Implement chat. Hopefully we don't need this soon, *coughDiscordGameB…
soccermitchy Dec 14, 2016
aa75345
Implement receiving the vehicle position data packet
soccermitchy Dec 14, 2016
2d63bc6
Remove unused 'using' directives.
soccermitchy Dec 14, 2016
de3c19a
Implement PedPositionData packet parsing
soccermitchy Dec 14, 2016
ffdf7e0
Implement NPCVehPositionData, NPCPedPositionData, WorldSharingStop
soccermitchy Dec 14, 2016
9e11c45
Fix formatting (resharper formatter thing)
soccermitchy Dec 15, 2016
9fa8f59
Add native response parsing... Fuck native responses.
soccermitchy Dec 16, 2016
e750ca5
Implement sendToAll. Next up: clearing up a bunch of 'todo's!
soccermitchy Dec 16, 2016
83879be
Broadcast a bunch of action packets
soccermitchy Dec 16, 2016
2fd30bf
Server now is able to start. It also has some warning messages for de…
soccermitchy Dec 16, 2016
980ca73
Build to an exe. Supports win10-x64 and win7-x64 atm
soccermitchy Dec 16, 2016
eff523d
update gitignore
soccermitchy Dec 16, 2016
9582a3f
Add publish profiles, change server port
soccermitchy Dec 16, 2016
bea9bba
Forgot exactly what I did
soccermitchy Dec 17, 2016
4c2c5aa
Added more publish profiles. Fixed VehicleData protocol class. Fixed …
soccermitchy Dec 18, 2016
cd05ea3
Disable starting server. Will be removed completly soon.
soccermitchy Dec 18, 2016
4d52d82
forgot what I did again
soccermitchy Dec 18, 2016
673a0c2
Server now has a config file.. and the file is in .gitignore
soccermitchy Dec 18, 2016
fc5e036
Update server version (on dev server)
soccermitchy Dec 18, 2016
bd3d21f
Update version in stable server
soccermitchy Dec 18, 2016
f9e050a
Update client version id
soccermitchy Dec 18, 2016
144f765
Revert "Server now has a config file.. and the file is in .gitignore"
soccermitchy Dec 18, 2016
56aef03
This is a disaster. Revert "Revert "Server now has a config file.. an…
soccermitchy Dec 18, 2016
8a61c4c
Revert client/server version changes
soccermitchy Dec 18, 2016
bec6f49
Update credits in mod
soccermitchy Dec 18, 2016
ea17b27
a bunch of stuff
soccermitchy Dec 18, 2016
3241b90
Move to .NET Standard 1.6
soccermitchy Dec 18, 2016
8650338
Add test plugin
soccermitchy Dec 18, 2016
0325b4a
Plugin API on server - now can load plugins. TODO: hooks for events i…
soccermitchy Dec 18, 2016
d5dcb3b
Better logging
soccermitchy Dec 19, 2016
d68f719
Start plugin event interface
soccermitchy Dec 19, 2016
f282de1
Add some more events to the plugin API
soccermitchy Dec 20, 2016
e60e908
Add second data field class, fix typo
soccermitchy Dec 20, 2016
c77443e
Fix OnIncomingConnectionApproval
soccermitchy Dec 20, 2016
d138d10
Add PacketEvents.OnIncomingStatusChange
soccermitchy Dec 20, 2016
13ffe88
Add OnIncomingDiscoveryRequest packet event
soccermitchy Dec 20, 2016
064b2ae
Add OnIncomingData event
soccermitchy Dec 20, 2016
5dd1deb
Add GameEvents.OnChatMessage
soccermitchy Dec 20, 2016
80976b3
Add OnVehicleDataUpdate
soccermitchy Dec 20, 2016
ccef5a1
Add OnPedDataUpdate
soccermitchy Dec 20, 2016
bb19a9c
Add OnNpcVehicleDataUpdate
soccermitchy Dec 20, 2016
075ac69
Add NpcPedPositionData
soccermitchy Dec 20, 2016
c7cd4de
Finish plugin events API, get rid of most conditional compilation, ga…
soccermitchy Dec 21, 2016
00e4226
Command support
soccermitchy Dec 21, 2016
74dd41e
Add some stuff for native calls
soccermitchy Dec 21, 2016
2255483
Port scripting functions to new server
soccermitchy Dec 21, 2016
30d4876
Add server announcing, OnTick event
soccermitchy Dec 21, 2016
5271530
May help to actually call the OnTick event
soccermitchy Dec 21, 2016
700ab16
Add config option for backup master server
soccermitchy Dec 21, 2016
1a6e075
Fix bug where clients could not connect.
soccermitchy Dec 21, 2016
bb10a62
Raise log level of announce message
soccermitchy Dec 21, 2016
c6f0f7f
A bunch of stuff.
soccermitchy Dec 22, 2016
986b127
A plugin that marks cracked clients to demonstrate the new API
soccermitchy Dec 22, 2016
443d6e6
Add TPS counter, fix bug where server thought it was supposed to be a…
soccermitchy Dec 23, 2016
cac04fe
.ipl parser (forgot to commit last night)
soccermitchy Dec 29, 2016
dd966b3
Don't commit gta5 data
soccermitchy Dec 29, 2016
ce0c813
Fix IPL parser, with some testing code.
soccermitchy Dec 29, 2016
2468cea
Remove testing code
soccermitchy Dec 29, 2016
c4836cd
Start stuff for parsing VNods
soccermitchy Dec 29, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -211,3 +211,7 @@ GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
*.csproj
*.csproj
*.csproj
gtaserver.core/serverSettings.xml
gtaserver.core/*.ipl
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "lidgren.network"]
path = lidgren.network
url = https://gitlab.com/TinyMP/LidgrenNetwork.git
9 changes: 9 additions & 0 deletions .pullapprove.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
approve_by_comment: true
approve_regex: ^Approved
reject_regex: ^Rejected
reset_on_push: false
reviewers:
members:
- Bluscream
name: pullapprove
required: 1
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: csharp
solution: GTACoOp.sln
os: windows
branches:
only:
- indev-server
57 changes: 57 additions & 0 deletions AdminTools/AdminSettings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
namespace AdminTools
{
public class AdminSettings
{
public bool Debug { get; set; }
public bool KickOnDefaultNickName { get; set; }
public bool KickOnNameDifference { get; set; }
public bool SocialClubOnly { get; set; }
public string MOTD { get; set; }
public int MaxPing { get; set; }
public bool AntiClones { get; set; }
public bool KickOnDifferentScript { get; set; }
public GTAServer.ScriptVersion NeededScriptVersion { get; set; }
public bool KickOnOutdatedGame { get; set; }
public int MinGameVersion { get; set; }
public bool ColoredNicknames { get; set; }
public bool OnlyAsciiNickName { get; set; }
public bool OnlyAsciiUserName { get; set; }
public bool LimitNickNames { get; set; }
public string CountryRestriction { get; set; }
public string ProtectedNickname { get; set; }
public string ProtectedNicknameIP { get; set; }

/*public bool WhiteListEnabled { get; set; }
public string[] WhiteList { get; set; }
public bool BlackListEnabled { get; set; }
public string[] BlackList { get; set; }*/

public AdminSettings()
{
Debug = false;
KickOnDefaultNickName = true;
KickOnNameDifference = false;
SocialClubOnly = false;
MOTD = "Welcome to this GTA 5 Co-op Server! Max Ping: 250";
MaxPing = 250;
AntiClones = true;
KickOnDifferentScript = true;
NeededScriptVersion = GTAServer.ScriptVersion.VERSION_0_9_3;
KickOnOutdatedGame = false;
MinGameVersion = 25;
ColoredNicknames = true;
OnlyAsciiNickName = true;
OnlyAsciiUserName = false;
LimitNickNames = true;
CountryRestriction = "";
ProtectedNickname = "";
ProtectedNicknameIP = "";
/*WhiteListEnabled = false;
WhiteList[0] = "Bluscream";
WhiteList[1] = "Redscream";
BlackListEnabled = false;
BlackList[0] = "Faggot";
BlackList[1] = "Bastard";*/
}
}
}
42 changes: 24 additions & 18 deletions AdminTools/AdminTools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<OutputPath>..\..\..\..\SERVERS\GameServer\Grand Theft Auto\GTA V\filterscripts\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand All @@ -38,15 +38,26 @@
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Lidgren.Network">
<HintPath>..\libs\Lidgren.Network.dll</HintPath>
<Reference Include="Lidgren.Network, Version=2012.1.7.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lidgren.Network.1.0.2\lib\net451\Lidgren.Network.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\libs\Newtonsoft.Json.dll</HintPath>
<Reference Include="MaxMind.Db, Version=2.0.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
<HintPath>..\packages\MaxMind.Db.2.0.0\lib\net45\MaxMind.Db.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MaxMind.GeoIP2, Version=2.6.0.0, Culture=neutral, PublicKeyToken=66afa4cc5ae853ac, processorArchitecture=MSIL">
<HintPath>..\packages\MaxMind.GeoIP2.2.6.0\lib\net45\MaxMind.GeoIP2.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<HintPath>..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Numerics" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand All @@ -55,27 +66,22 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="AdminSettings.cs" />
<Compile Include="MainFilterscript.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Server\GTAServer.csproj">
<Project>{559ee224-bf7b-49d8-9cee-11e6ba71fe4e}</Project>
<Name>GTAServer</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
18 changes: 18 additions & 0 deletions AdminTools/AdminTools.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0"?>
<AdminSettings xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Debug>false</Debug>
<KickOnDefaultNickName>true</KickOnDefaultNickName>
<KickOnNameDifference>false</KickOnNameDifference>
<SocialClubOnly>false</SocialClubOnly>
<MOTD>Welcome to this GTA 5 Co-op Server! Max Ping: 250</MOTD>
<MaxPing>250</MaxPing>
<AntiClones>true</AntiClones>
<KickOnDifferentScript>true</KickOnDifferentScript>
<MinScriptVersion>VERSION_0_9_2</MinScriptVersion>
<KickOnOutdatedGame>false</KickOnOutdatedGame>
<MinGameVersion>25</MinGameVersion>
<ColoredNicknames>true</ColoredNicknames>
<OnlyAsciiNickName>true</OnlyAsciiNickName>
<OnlyAsciiUserName>false</OnlyAsciiUserName>
<LimitNickNames>true</LimitNickNames>
</AdminSettings>
Loading