Commit Graph

875 Commits

Author SHA1 Message Date
VegaZ
1237870a89 Try fix 2018-10-24 22:30:43 +02:00
hydrant
55b48e80b2 Changed NativeUi writing 2018-10-24 22:26:24 +02:00
hydrant
a4a9114f72 Changed NativeUi writing 2018-10-24 22:26:24 +02:00
hydrant
449d1c46b2 Added NativeUi 2018-10-24 22:25:17 +02:00
hydrant
3e7a72eff7 Added NativeUi 2018-10-24 22:25:17 +02:00
hydrant
23f9838c7f Merge Conflicts 2018-10-24 22:24:28 +02:00
hydrant
2ddd7ad948 Merge Conflicts 2018-10-24 22:24:28 +02:00
hydrant
11c3e1ae3c Trying to fix nativeui issue 2018-10-24 22:23:53 +02:00
hydrant
0adc7fefa8 Trying to fix nativeui issue 2018-10-24 22:23:53 +02:00
VegaZ
3d3d16f897 Update index.js 2018-10-24 22:23:45 +02:00
VegaZ
014d841582 Update index.js 2018-10-24 22:23:45 +02:00
VegaZ
00c1f6c709 Update index.js 2018-10-24 22:12:07 +02:00
VegaZ
fd0fc03447 Update index.js 2018-10-24 22:12:07 +02:00
VegaZ
26e5cc3b5b Update index.js 2018-10-24 22:08:41 +02:00
VegaZ
7799264f18 Update index.js 2018-10-24 22:08:41 +02:00
VegaZ
02d7be21cc Update Admin.cs 2018-10-24 21:32:56 +02:00
VegaZ
234414b5d4 Update Admin.cs 2018-10-24 21:32:56 +02:00
VegaZ
14a09efae1 Update index.js 2018-10-24 21:31:56 +02:00
VegaZ
adede0b3ea Update index.js 2018-10-24 21:31:56 +02:00
hydrant
22d1f4c4aa Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-24 21:08:15 +02:00
hydrant
9446b9985e Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-24 21:08:15 +02:00
hydrant
97ee8f694e Added Custom Names for tuning parts 2018-10-24 21:08:04 +02:00
hydrant
3a4b210f87 Added Custom Names for tuning parts 2018-10-24 21:08:04 +02:00
VegaZ
6e6068f4f9 Merge branch 'feature/character-creator' into 'develop'
Feature/character creator

See merge request log-gtav/reallife-gamemode!4
2018-10-24 20:51:54 +02:00
VegaZ
a36d489824 Merge branch 'feature/character-creator' into 'develop'
Feature/character creator

See merge request log-gtav/reallife-gamemode!4
2018-10-24 20:51:54 +02:00
VegaZ
6e16db56bd Feature/character creator 2018-10-24 20:51:54 +02:00
VegaZ
ae6801cedb Feature/character creator 2018-10-24 20:51:54 +02:00
hydrant
bf13d7ed4a Added missing semicolon 2018-10-24 20:01:04 +02:00
hydrant
5d581ed66d Added missing semicolon 2018-10-24 20:01:04 +02:00
xSprite
cbaf065663 Add /load 2018-10-23 04:16:13 +02:00
xSprite
d7db2d7565 Add /load 2018-10-23 04:16:13 +02:00
xSprite
e6793f545e Add /aneon, /vehsmoke 2018-10-23 02:39:55 +02:00
xSprite
af21e3d4c8 Add /aneon, /vehsmoke 2018-10-23 02:39:55 +02:00
hydrant
052053465f Improved tuning display texts 2018-10-23 01:09:22 +02:00
hydrant
ca14bff601 Improved tuning display texts 2018-10-23 01:09:22 +02:00
hydrant
c0c38e5bc5 Removed textlabels, Fixed chat not showing up after exiting tuning menu 2018-10-22 22:46:19 +02:00
hydrant
3173fab98a Removed textlabels, Fixed chat not showing up after exiting tuning menu 2018-10-22 22:46:19 +02:00
hydrant
61d5938b1c Removed unnecessary command 2018-10-22 22:20:48 +02:00
hydrant
43211a5eea Removed unnecessary command 2018-10-22 22:20:48 +02:00
hydrant
1847d46be3 Merge branch 'feature/tuning-system' into develop 2018-10-22 22:19:44 +02:00
hydrant
42755fa935 Merge branch 'feature/tuning-system' into develop 2018-10-22 22:19:44 +02:00
hydrant
6ba2515028 Removed wrong files 2018-10-22 22:18:33 +02:00
hydrant
4ed07d6ffb Removed wrong files 2018-10-22 22:18:33 +02:00
hydrant
eb7f50fd54 Finished tuning system 2018-10-22 22:17:03 +02:00
hydrant
d667406a5c Finished tuning system 2018-10-22 22:17:03 +02:00
hydrant
15e1e52b67 Added tuning menu 2018-10-22 21:42:33 +02:00
hydrant
b99eaa4f77 Added tuning menu 2018-10-22 21:42:33 +02:00
VegaZ
81e18eb765 Fix merge conflicts 2018-10-22 20:22:45 +02:00
VegaZ
08646c723d Fix merge conflicts 2018-10-22 20:22:45 +02:00
VegaZ
00975dda33 Fix Duty 2018-10-22 20:19:33 +02:00