Commit Graph

187 Commits

Author SHA1 Message Date
VegaZ
6d2ccceb53 Committing for merge 2019-01-08 14:43:54 +01:00
VegaZ
5c84dc177d Start Medic System / FactionInteraction 2018-12-27 22:21:59 +01:00
VegaZ
4ea09f0034 Remove some commented lines 2018-12-27 18:20:27 +01:00
VegaZ
3df210c023 Another inv fix 2018-12-27 00:06:07 +01:00
VegaZ
b35ee0ad60 Made changes to key.js, inventory trade result 2018-12-26 23:55:58 +01:00
VegaZ
a80f7d340f Small fix in Interaction2 2018-12-26 23:39:13 +01:00
VegaZ
78726f3f6a Small fix in Interaction 2018-12-26 23:32:57 +01:00
VegaZ
f0e24cf1ae Resolve merge conflict 2018-12-26 23:00:53 +01:00
VegaZ
ec1cc4b237 Add Trading 2018-12-26 22:59:15 +01:00
hydrant
92edb008cf Added script for smooth acceleration 2018-12-26 21:40:36 +01:00
hydrant
7c4d0eccc5 Added vehicle door menu 2018-12-26 19:15:58 +01:00
hydrant
7c99a1981a Added /reloaddoors Command 2018-12-26 16:19:38 +01:00
hydrant
882391265a Finished interior system 2018-12-25 23:53:55 +01:00
VegaZ
3fc364433c Add Tesla, fix player/keys 2018-12-25 17:38:23 +01:00
hydrant
d22cf6e1ba Removed vespucci cardealer, add interior system (teleport missing) 2018-12-24 15:27: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
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
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
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
cf0bd66f78 try fixing vehicle sync issues 2018-12-18 23:09:54 +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
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
hydrant
2818fd3513 Added tuning support for colored lights 2018-12-15 14:00:01 +01:00
hydrant
7a5f820068 Fixing issues from vehiclesync 2018-12-15 11:13:34 +01:00
hydrant
e927eee227 Fixed new issue with vehicle sync 2018-12-14 18:19:21 +01:00
hydrant
3fc109ff8b Fixed tuning issue, added new dlc cars to car list, added command to open tuning menu 2018-12-14 18:08:01 +01:00
VegaZ
ff652a3152 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-10 22:23:12 +01:00
VegaZ
4e10a155b1 Fix stack negatives 2018-12-10 22:23:03 +01:00
hydrant
9b63c53cc8 Fixed vehiclesync issues 2018-12-10 22:18:53 +01:00
hydrant
43cf1edc7a Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-10 22:10:24 +01:00
hydrant
ee9b1641d1 Try fixing vehiclesync issues 2018-12-10 22:10:19 +01:00
VegaZ
0be5de257e Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-10 22:01:53 +01:00
VegaZ
f824d6a160 Fix Inventory Bug 2018-12-10 22:01:35 +01:00
hydrant
819bed9882 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-12-10 21:37:41 +01:00