Commit Graph

165 Commits

Author SHA1 Message Date
VegaZ
94f7fff754 Fix merge conflicts 2018-10-15 17:14:34 +02:00
VegaZ
85037eddca Merge confligt resolve 2018-10-15 17:09:31 +02:00
VegaZ
acd68f0e2d Merge 2018-10-15 17:07:48 +02:00
VegaZ
3324a541fc Merge branch 'feature/user-backend' into develop 2018-10-15 17:05:35 +02:00
VegaZ
fbef6cb3dc Add Shop / ShopCategory 2018-10-15 17:04:40 +02:00
Lennart Kampshoff
679a72902f Added /vmod Command (Mod Vehicles by command) 2018-10-15 00:24:36 +02:00
Lennart Kampshoff
88055f8ab4 Added optional texture parameter to /clothes and /props 2018-10-15 00:04:09 +02:00
Lennart Kampshoff
493c158d02 Fixed /a and /aw 2018-10-14 23:58:07 +02:00
Lennart Kampshoff
a626b74f64 Added Clothes and Player Props 2018-10-14 23:04:08 +02:00
Lennart Kampshoff
2de3935e39 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-12 21:36:40 +02:00
Lennart Kampshoff
49de529514 Added Admin Speed Command (not implemented rn) 2018-10-12 21:36:36 +02:00
VegaZ
0227e223c2 Add VehicleShop, SaveManager, Edit LoadManager amm... 2018-10-10 21:06:20 +02:00
VegaZ
e0bc6ef9aa Add more types of moneytransfer 2018-10-09 21:41:52 +02:00
VegaZ
e11d453e27 Add TransferMoney Test 2018-10-09 21:02:05 +02:00
xNccPlay
c47097ed5a Fix broadcastmessage for setweather command 2018-10-08 19:32:11 +02:00
VegaZ
62e7f6f959 Upload New File 2018-10-08 19:26:09 +02:00
xNccPlay
9d96933989 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-08 19:24:24 +02:00
xNccPlay
ec594bc232 Add broadcastmessage to setweather command 2018-10-08 19:23:34 +02:00
VegaZ
25a37f03f9 Cleanup LoadManager 2018-10-08 19:01:29 +02:00
Lennart Kampshoff
52138ff832 Fixed login position 2018-10-08 12:04:13 +02:00
Lennart Kampshoff
65f2e615a4 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-07 20:44:07 +02:00
Lennart Kampshoff
223dff559e Removed unneccessary debug message 2018-10-07 20:43:51 +02:00
VegaZ
69c9a3183a Delete VehicleExtension.cs 2018-10-07 20:40:56 +02:00
VegaZ
9cda996082 Upload New File 2018-10-07 20:18:16 +02:00
VegaZ
2b468c168c Merge branch 'feature/save-system' into 'develop'
Feature/save system

See merge request log-gtav/reallife-gamemode!3
2018-10-07 20:17:06 +02:00
VegaZ
7501235cd4 Feature/save system 2018-10-07 20:17:06 +02:00
VegaZ
8a46eded94 Rewrite of playerlist (not working) 2018-10-05 20:06:30 +02:00
Lennart Kampshoff
0dbafc0b94 Fix /veh 2018-10-05 19:31:15 +02:00
VegaZ
60688d2178 Add Tablefill 2018-10-03 20:36:18 +02:00
Lennart Kampshoff
e900499893 Fixed server -> client transport 2018-10-03 19:14:58 +02:00
VegaZ
d9d9b06914 Add Playerlist (tablist) 2018-10-03 19:02:48 +02:00
Lennart Kampshoff
0bb235fbfd Fixed server crash when unknown vehicle is spawned, Car gets teleported on /to and /gh 2018-10-03 12:51:09 +02:00
Lennart Kampshoff
5d2e37645c Add xNcc to whitelist 2018-10-03 00:20:17 +02:00
Lennart Kampshoff
2e5082afaf Admin Broadcast on unauthorized login attempt 2018-10-02 23:34:00 +02:00
Lennart Kampshoff
82e6999cc7 Removed unneccessary console outputs 2018-10-02 23:10:14 +02:00
Lennart Kampshoff
e8cde556e0 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-02 22:59:28 +02:00
Lennart Kampshoff
530d5a4250 Modified Whitelist, Disconnect Event only on logged-in players 2018-10-02 22:58:58 +02:00
VegaZ
4c3481fc95 Update .gitlab-ci.yml 2018-10-02 22:54:57 +02:00
VegaZ
45de10555f Destroy Browser if not whitelisted 2018-10-02 17:51:37 +02:00
VegaZ
3b9f2057a7 Fix Whitelist (ich bin dumm) 2018-10-02 17:47:45 +02:00
VegaZ
ca53b9702f Add Whitelist 2018-10-02 17:41:36 +02:00
Lennart Kampshoff
ffef07a8cd Cleaned up meta.xml 2018-09-30 19:14:44 +02:00
Lennart Kampshoff
365dc3d64b Fix login message 2018-09-30 02:47:26 +02:00
Lennart Kampshoff
7b919fbc3c Fixed login for non-registered users 2018-09-30 02:33:36 +02:00
hydrant
d1f6d9af2c Update .gitlab-ci.yml 2018-09-30 01:45:32 +02:00
hydrant
adb4d6649e Update .gitlab-ci.yml 2018-09-30 01:41:02 +02:00
Lennart Kampshoff
c738406898 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-09-30 00:47:42 +02:00
hydrant
4ed03f45f2 Renamed csproj 2018-09-30 00:47:28 +02:00
Lennart Kampshoff
21a9698a35 Cleand up code, fixed unban 2018-09-30 00:46:16 +02:00
hydrant
f27d624926 Update reallife-gamemode.csproj 2018-09-29 23:57:41 +02:00