Commit Graph

127 Commits

Author SHA1 Message Date
hydrant
9872e38c75 Merge 2018-10-15 19:29:51 +02:00
hydrant
243f460736 Simplified /team 2018-10-15 19:29:25 +02:00
VegaZ
93f4077cb8 Fix ShopVehicles, Upodate /goto 2018-10-15 19:03:45 +02:00
VegaZ
42e1dc6e07 Add /goto and /save goto 2018-10-15 18:29:16 +02:00
hydrant
216bdb4c6c Fixed errors 2018-10-15 17:33:58 +02:00
VegaZ
8000746fd0 Fix more merge conflicts 2018-10-15 17:22:16 +02:00
VegaZ
9439ed3e4f Fix merge conflicts 2018-10-15 17:14:34 +02:00
VegaZ
d566723213 Merge confligt resolve 2018-10-15 17:09:31 +02:00
VegaZ
2b82f4c93f Merge 2018-10-15 17:07:48 +02:00
VegaZ
6c57e9df59 Merge branch 'feature/user-backend' into develop 2018-10-15 17:05:35 +02:00
VegaZ
529145d2c1 Add Shop / ShopCategory 2018-10-15 17:04:40 +02:00
hydrant
ba6e45074d Added /vmod Command (Mod Vehicles by command) 2018-10-15 00:24:36 +02:00
hydrant
8bbdc51438 Added optional texture parameter to /clothes and /props 2018-10-15 00:04:09 +02:00
hydrant
b7d4ce6160 Fixed /a and /aw 2018-10-14 23:58:07 +02:00
hydrant
e1e3caaf6b Added Clothes and Player Props 2018-10-14 23:04:08 +02:00
hydrant
eaebb81d37 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
hydrant
b6fbecab7c Added Admin Speed Command (not implemented rn) 2018-10-12 21:36:36 +02:00
VegaZ
e25af059a4 Add VehicleShop, SaveManager, Edit LoadManager amm... 2018-10-10 21:06:20 +02:00
VegaZ
7d21f9c06e Add more types of moneytransfer 2018-10-09 21:41:52 +02:00
VegaZ
e3070913cb Add TransferMoney Test 2018-10-09 21:02:05 +02:00
xNccPlay
2dc259ad88 Fix broadcastmessage for setweather command 2018-10-08 19:32:11 +02:00
xNccPlay
17a977a5be 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
28154c2ba1 Add broadcastmessage to setweather command 2018-10-08 19:23:34 +02:00
VegaZ
cacff0dc3c Cleanup LoadManager 2018-10-08 19:01:29 +02:00
hydrant
80c4b7bc34 Fixed login position 2018-10-08 12:04:13 +02:00
hydrant
59a244fe05 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
hydrant
a77f210a0e Removed unneccessary debug message 2018-10-07 20:43:51 +02:00
VegaZ
1452359cc3 Delete VehicleExtension.cs 2018-10-07 20:40:56 +02:00
VegaZ
5d1983f97a Feature/save system 2018-10-07 20:17:06 +02:00
hydrant
44028f6310 Fix /veh 2018-10-05 19:31:15 +02:00
hydrant
ef51044840 Fixed server -> client transport 2018-10-03 19:14:58 +02:00
VegaZ
e7b2c06e92 Add Playerlist (tablist) 2018-10-03 19:02:48 +02:00
hydrant
33d54944a2 Fixed server crash when unknown vehicle is spawned, Car gets teleported on /to and /gh 2018-10-03 12:51:09 +02:00
hydrant
bab7a9aa73 Add xNcc to whitelist 2018-10-03 00:20:17 +02:00
hydrant
3847b31135 Admin Broadcast on unauthorized login attempt 2018-10-02 23:34:00 +02:00
hydrant
8381188ee2 Removed unneccessary console outputs 2018-10-02 23:10:14 +02:00
hydrant
3af8694d01 Modified Whitelist, Disconnect Event only on logged-in players 2018-10-02 22:58:58 +02:00
VegaZ
5fe0173855 Destroy Browser if not whitelisted 2018-10-02 17:51:37 +02:00
VegaZ
f0a9f90a4f Fix Whitelist (ich bin dumm) 2018-10-02 17:47:45 +02:00
VegaZ
fb1c425119 Add Whitelist 2018-10-02 17:41:36 +02:00
hydrant
5e3f15fcf6 Fix login message 2018-09-30 02:47:26 +02:00
hydrant
3b6e4baa7d Fixed login for non-registered users 2018-09-30 02:33:36 +02:00
hydrant
9b2a33d819 Cleand up code, fixed unban 2018-09-30 00:46:16 +02:00
VegaZ
55c95cc5c3 Initial commit for player keys 2018-09-29 00:07:36 +02:00
hydrant
be028d5aab Merge branch 'feature/faction-system' into develop 2018-09-28 17:52:09 +02:00
hydrant
d057140c32 Finished faction system, slightly changed client files 2018-09-28 17:40:29 +02:00
VegaZ
54d9e57669 Found the lost infobox (M4tr1x) 2018-09-27 21:27:24 +02:00
VegaZ
07e6ff67d8 Resolve merge conflicts 2 2018-09-27 20:34:38 +02:00
VegaZ
3afa1f1c41 Resolve merge conflict 2018-09-27 20:33:13 +02:00
VegaZ
b743e6c8ec Merge branch 'feature/user-backend' into develop 2018-09-27 20:29:34 +02:00