Commit Graph

2676 Commits

Author SHA1 Message Date
hydrant
972f8e5637 fix 2021-04-03 23:31:49 +02:00
hydrant
9d1828c6bd Merge branch 'develop' into 'master'
[HOTFIX] Fix undefined in infobox, Taxi call , Drivingschool menu and online list

See merge request log-gtav/reallife-gamemode!29
2021-04-03 21:24:51 +00:00
kookroach
976e71451c Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-03 23:21:08 +02:00
kookroach
8393d13eb8 fix last 2021-04-03 23:20:42 +02:00
hydrant
f14c11632b fix 2021-04-03 23:16:45 +02:00
hydrant
a8e0df3bb1 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-03 23:16:03 +02:00
hydrant
95c84ec40e Add checkstats 2021-04-03 23:15:53 +02:00
kookroach
df306792de fix 2021-04-03 23:13:37 +02:00
kookroach
04ea942f75 fix bank money 2021-04-03 23:09:56 +02:00
kookroach
18a38523b4 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-03 23:00:10 +02:00
kookroach
51c761789d Medic müssen Soli zahlen 2021-04-03 22:58:34 +02:00
hydrant
b92b4e8b48 fix onlineliste 2021-04-03 22:58:23 +02:00
hydrant
bf41f8faa9 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2021-04-03 22:56:27 +02:00
hydrant
44aaea6021 /lc und /ga für admins 2021-04-03 22:56:06 +02:00
hydrant
a360d5e06e onlineliste nach id sortieren 2021-04-03 22:55:53 +02:00
hydrant
27ef35750d kein taxi rufen 2021-04-03 22:55:38 +02:00
hydrant
eaf7c65813 fix get set data nullreference 2021-04-03 22:55:27 +02:00
kookroach
fa8a39c9c3 Fix DrivingSchool selection 2021-04-03 22:51:41 +02:00
MichaPlays
0a37547390 Merge branch 'develop' into 'master'
[HOTFIX] GlobalData Menu and Heal Range

See merge request log-gtav/reallife-gamemode!28
2021-04-03 20:10:21 +00:00
kookroach
a0570fb0b4 fix NoClip 2021-04-03 22:05:26 +02:00
kookroach
d939b9590b Add Admin Noclip , add /skill and fix heal :^) 2021-04-03 21:58:02 +02:00
kookroach
5b7d03fec3 Fix X Menu 2021-04-03 21:35:42 +02:00
kookroach
e463201a85 globalData Menu fix 2021-04-03 21:28:58 +02:00
kookroach
14c296505e globalData InMenu bugfix 2021-04-03 21:06:53 +02:00
kookroach
64fcd3749f Fix small typo 2021-04-03 20:34:34 +02:00
kookroach
1e05bb108c Remove inInput -> replace with inMenu 2021-04-03 20:32:11 +02:00
MichaPlays
6d99ff64ae Merge branch 'develop' into 'master'
[HOTFIX] Deposit Negative Value in Bank

See merge request log-gtav/reallife-gamemode!27
2021-04-03 18:10:21 +00:00
hydrant
ee305b78ec Revert "Fix I O M"
This reverts commit 895136bc72
2021-04-03 20:08:39 +02:00
VegaZ
8abec2866a Fix EInzahlen Minusbetrag 2021-04-03 20:04:23 +02:00
kookroach
895136bc72 Fix I O M 2021-04-03 19:46:56 +02:00
MichaPlays
7d96cc73c6 Merge branch 'develop' into 'master'
[HOTFIX] GlobalData Menu Bug

See merge request log-gtav/reallife-gamemode!26
2021-04-03 17:26:50 +00:00
VegaZ
eb03e2a60a Register Fix? 2021-04-03 19:16:51 +02:00
VegaZ
88b82b8cb7 Fix Login Keys 2021-04-03 19:02:55 +02:00
hydrant
4cbe31cddb Merge branch 'develop' into 'master'
inventar revert

See merge request log-gtav/reallife-gamemode!25
2021-04-03 15:56:48 +00:00
hydrant
b08d4e74e7 try client fix 2021-04-03 17:55:30 +02:00
hydrant
229767b833 inventar revert 2021-04-03 17:53:44 +02:00
hydrant
8a54afcd4c Merge branch 'develop' into 'master'
Develop

See merge request log-gtav/reallife-gamemode!24
2021-04-03 15:39:19 +00:00
hydrant
a414148f5e cityhall bugfix 2021-04-03 17:34:05 +02:00
hydrant
532f2c1c96 freecam raus 2021-04-03 17:33:42 +02:00
hydrant
50d9f4d2f5 nur 1 resourcestart event 2021-04-03 17:27:16 +02:00
hydrant
969222524e Merge branch 'develop' into 'master'
Develop

See merge request log-gtav/reallife-gamemode!23
2021-04-03 15:08:25 +00:00
hydrant
9480926f28 DATENBANK 2021-04-03 17:05:26 +02:00
hydrant
9fc4a24345 attachment fehler 2021-04-03 16:44:55 +02:00
michael.reiswich
1e7cc0b025 database change auf dev 2021-04-03 16:08:50 +02:00
michael.reiswich
6ffe79ae5f Merge branch 'develop' 2021-04-03 16:07:24 +02:00
michael.reiswich
0543775330 Changes on Attachment Manager.
Removed attachment due to failure in attachment manager.
Changed Database to Live Database -> will be changed after Master merge

Add to enteties.ts RageObject and RageObjectPool for Attachment Manager
2021-04-03 16:06:44 +02:00
michael.reiswich
894ae7465f change tuning prices 2021-04-03 12:35:19 +02:00
michael.reiswich
dacaf84cf7 change Gangwar-time & change KH-time & edit Indroduction & change help & delete Ahelp 2021-04-03 11:51:27 +02:00
hydrant
b4326c11cc inventar?? 2021-04-03 00:07:10 +02:00
hydrant
62c92f56cf item aufheben textlabel 2021-04-03 00:05:52 +02:00