Commit Graph

1525 Commits

Author SHA1 Message Date
Fabian
dab527aa5e fick die merge conflikte 2021-04-22 16:44:32 +02:00
Fabian
4dc7ecd824 merge conflict 2021-04-22 16:39:18 +02:00
hydrant
1495cc0c87 Wanted: Bei Einsperren 6$ pro Wanted je an PD/FIB Kasse 2021-04-22 14:49:12 +02:00
hydrant
a71fd4d55d fix lc 2021-04-22 14:12:09 +02:00
hydrant
2483e0e726 /tog lc fix 2021-04-22 14:06:30 +02:00
hydrant
a830b32711 Admin: /tog all @AIRMAKE 2021-04-22 13:59:38 +02:00
hydrant
e669425dd8 Handsup: Nur noch möglich, wenn man still steht 2021-04-22 13:52:05 +02:00
hydrant
be5dc8c8ca [-] "CmdAnim" -> "CmdUserHup" 2021-04-22 13:11:47 +02:00
hydrant
a26a7991f7 Datenbank: PowerShell-Skripte für Datenbank-Upgrade und neue Migration 2021-04-22 13:10:27 +02:00
hydrant
b06d429c73 LSPD/FIB: Fix einsperren 2021-04-22 11:19:48 +02:00
hydrant
b608ead71d FIB/LSPD: Fix Ticketpreis Verteilung 2021-04-22 01:39:20 +02:00
hydrant
3546ba7f99 vlt fix kfz id bug?? 2021-04-22 01:15:38 +02:00
hydrant
57e7455abf fix route 3 bus skill 3 2021-04-22 00:00:47 +02:00
hydrant
9459cd9ed3 Revert "nodmzone, COMMIT NUR ZUM TESTEN"
This reverts commit 3edd6b5560
2021-04-21 23:14:14 +02:00
556f270b06 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-21 22:59:25 +02:00
8f9710688a Fix BusDriver Problem needs testing 2021-04-21 22:58:06 +02:00
Fabian
3edd6b5560 nodmzone, COMMIT NUR ZUM TESTEN 2021-04-21 22:36:06 +02:00
5cc0591e9c Change Order of events on Death.cs 2021-04-21 22:12:25 +02:00
hydrant
d413c5c8cb Job: Alle Prefix zu "[JOB]" vereinheitlicht 2021-04-21 22:05:58 +02:00
3f417e6681 Decrease range needed for coppers to get criminals binned after death.
From 200 to 100.
2021-04-21 21:42:34 +02:00
ddb52fe9b6 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-21 21:32:31 +02:00
4fe9365902 Change vehicle taxation
see https://life-of-german.org/bugtracker/bug/60-neue-fahrzeugsteuern/

@hydrant update DB before merge with master.
2021-04-21 21:32:19 +02:00
Fabian
fed8dc786d test ausgaben entfernt 2021-04-21 20:33:58 +02:00
Fabian
ee2a13fea0 test damage stuff 2021-04-21 20:01:49 +02:00
hydrant
94ba5980c9 Vagos Basis WT Punkt gefixt 2021-04-21 18:01:49 +02:00
hydrant
479d5adc32 fix tog lc 2021-04-21 00:10:44 +02:00
hydrant
7a7b7fde22 fix tog 2021-04-21 00:07:00 +02:00
hydrant
126aefe4b8 fix tog d 2021-04-20 23:53:59 +02:00
hydrant
d12f10fbb4 /tog d & ga 2021-04-20 23:41:22 +02:00
hydrant
e3a9b0d7e5 wt gburrito2 2021-04-20 23:34:48 +02:00
VegaZ
262c8bbe03 Add Car sell confirmation 2021-04-19 21:58:19 +02:00
hydrant
e30f1bb7f3 admin unshow und tsupport links anzeigen 2021-04-19 21:16:15 +02:00
hydrant
8485102e49 chat logs 2021-04-19 14:15:08 +02:00
hydrant
f0b2eca560 login logout logs 2021-04-19 12:17:56 +02:00
hydrant
06de6ef1a4 vmtl fix medic online duty count 2021-04-19 11:20:45 +02:00
hydrant
37834f24f7 vagos nametag blip fix 2021-04-19 02:11:37 +02:00
hydrant
4805a198f9 Vagos WT FIX 2021-04-19 02:11:26 +02:00
hydrant
2ce107eff5 VAGOS WAFFENSCHRANK 2021-04-19 01:57:05 +02:00
hydrant
a6d621cad4 Merge branch 'feature/onlinelist' into develop 2021-04-19 01:55:38 +02:00
hydrant
994672d99c NEUE ONLINELISTE DANKE EMRE.NL 2021-04-19 01:54:14 +02:00
hydrant
efa7229914 vagos blip und nametag BITTE TESTEN 2021-04-19 01:32:04 +02:00
hydrant
13d7af7ca8 vagos gangwar BITTE TESTEN 2021-04-19 01:28:26 +02:00
hydrant
ac91ceb1f3 fix gw leave fehler 2021-04-19 01:27:58 +02:00
hydrant
60e97695b5 vagos in wt 2021-04-19 01:27:57 +02:00
hydrant
4961c463b4 /ga universell für alle GangOwned Fraktionen 2021-04-19 01:27:57 +02:00
hydrant
c722c637bd Server Crash OnPlayerEnterVehicle vmtl gefixt 2021-04-19 01:27:56 +02:00
Fabian
a56b30c1d5 ja§ 2021-04-19 00:38:36 +02:00
Fabian
d72702951f player cuff nach clear 2021-04-19 00:32:00 +02:00
5afc0d86d9 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-19 00:14:59 +02:00
75d9497de3 Change HP amount and Cooldown 2021-04-18 22:09:47 +02:00