Commit Graph

733 Commits

Author SHA1 Message Date
hydrant
13a0997d53 Added interior marker / textlabel repositioning when changing enter / exit position 2018-12-25 12:14:32 +01:00
hydrant
d22cf6e1ba Removed vespucci cardealer, add interior system (teleport missing) 2018-12-24 15:27:22 +01:00
VegaZ
cae6c951a9 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-24 15:18:29 +01:00
VegaZ
76c11152f2 Adjust item drop 2018-12-24 15:18:22 +01:00
hydrant
51adea2dc4 Added city hall interior 2018-12-24 13:06:05 +01:00
VegaZ
202311ea40 Fix some things(Inventory) 2018-12-23 22:34:47 +01:00
VegaZ
fd43a5370b Fix DroppableItem 2018-12-23 22:18:14 +01:00
VegaZ
8bc9a74ab9 Fix pickup bug #2 2018-12-23 21:45:02 +01:00
VegaZ
8e187347d6 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-23 21:38:24 +01:00
VegaZ
99d27062d5 Fix pickup bug 2018-12-23 21:38:12 +01:00
hydrant
aac78dc69a Removed wrong vehicles 2018-12-23 21:37:38 +01:00
hydrant
bffb44387b Added vehicle interaction menu 2018-12-23 21:33:09 +01:00
VegaZ
2191e1e201 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-23 20:42:28 +01:00
VegaZ
0daa31fefc Add Drop Item and Pick up item 2018-12-23 20:42:17 +01:00
hydrant
37a3375e24 Fixed cardealer dialog 2018-12-22 17:27:27 +01:00
hydrant
4854d884b9 Fixed vehicle sync 2018-12-22 16:15:51 +01:00
hydrant
ae792536b4 Merge branch 'feature/carshop' into develop 2018-12-22 15:02:42 +01:00
hydrant
60ff2bc195 Finished carshops 2018-12-22 15:02:05 +01:00
hydrant
315cd2b3ec Added leave of vehicle when closing veh buy dialog, disabled N key for shop vehicles 2018-12-20 22:33:46 +01:00
hydrant
9f9d84f383 start car shop 2018-12-20 22:20:19 +01:00
hydrant
b16ed270c2 Refactored inventory system 2018-12-19 21:14:36 +01:00
VegaZ
98d6ecb01a Add unsafed Files 2018-12-19 20:26:20 +01:00
VegaZ
a04cd81ede Add drop to Inventory 2018-12-19 20:22:00 +01:00
VegaZ
a542409855 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-18 23:22:33 +01:00
VegaZ
f9e488b329 Finish interaction on items 2018-12-18 23:22:27 +01:00
hydrant
296270b31d vehicle sync debug message 2018-12-18 23:13:18 +01:00
hydrant
cf0bd66f78 try fixing vehicle sync issues 2018-12-18 23:09:54 +01:00
VegaZ
0fa58ca680 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-18 22:31:17 +01:00
hydrant
727240072c Fixed InventoryManager.LoadItems 2018-12-18 22:26:07 +01:00
VegaZ
3eb5ed1a97 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-18 22:23:55 +01:00
hydrant
402b7d4f41 Refactored inventory system 2018-12-18 22:23:33 +01:00
VegaZ
9786c66e45 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-18 22:15:31 +01:00
VegaZ
a4845a9cc5 Add Radial Menu to Inventory / Item Interaction 2018-12-18 22:15:17 +01:00
hydrant
4b81803883 Removed map improvements, added vespucci car dealer, improved csproj, fixed vehiclesync 2018-12-18 22:14:03 +01:00
hydrant
6de309fe7f Commit 2018-12-17 21:42:42 +01:00
hydrant
81a310e54e Update .gitlab-ci.yml 2018-12-16 21:09:39 +01:00
hydrant
5871f8b6cb Update .gitlab-ci.yml 2018-12-16 21:04:55 +01:00
hydrant
e9dbfabad0 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-16 20:09:13 +01:00
hydrant
f3f242fb77 Reimplemented cloting loading on login 2018-12-16 20:08:52 +01:00
hydrant
0564c48feb Update .gitlab-ci.yml 2018-12-16 20:01:02 +01:00
hydrant
72f1f5e7fd Update .gitlab-ci.yml 2018-12-16 19:52:51 +01:00
hydrant
940e581f2b Try fix issues 2018-12-16 19:41:21 +01:00
hydrant
b385883379 Try fixing veh sync issue 2018-12-16 12:27:08 +01:00
hydrant
df58d50941 Vehicle system 2018-12-16 12:08:29 +01:00
hydrant
08ed548732 Fixed login issue 2018-12-16 11:37:52 +01:00
hydrant
fd5439ca71 Fixed login error 2018-12-16 00:59:45 +01:00
hydrant
5fab926d28 Added some unknown vehicles to vehicle list, removed debug message from tuning manager 2018-12-16 00:45:34 +01:00
VegaZ
db9dfb1002 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-16 00:17:02 +01:00
VegaZ
8064549f8b Show inventory for Admins 2018-12-16 00:16:54 +01:00
hydrant
dd671df43a Improved tuning, reimplemented /time (use /time -1 to resume time manager) 2018-12-15 16:21:02 +01:00