Commit Graph

759 Commits

Author SHA1 Message Date
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
VegaZ
80f23866f7 Fix Duty 2018-10-22 20:19:33 +02:00
VegaZ
e54337a573 Extend death-system 2018-10-22 20:09:14 +02:00
VegaZ
2474033513 Extend death-system 2018-10-22 20:09:14 +02:00
xSprite
4766d25a17 fix freekh 2018-10-22 00:37:40 +02:00
xSprite
e8caca16eb fix freekh 2018-10-22 00:37:40 +02:00
xSprite
227eab8c27 fix freekh, change login death 2018-10-22 00:30:21 +02:00
xSprite
5580d06b09 fix freekh, change login death 2018-10-22 00:30:21 +02:00
xSprite
2f9b00b798 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-22 00:17:58 +02:00
xSprite
03dea88145 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-22 00:17:58 +02:00
xSprite
d6e3d90127 Add /freekh, /arevive, Chat on Death, fix DeathAdminMsg 2018-10-22 00:16:34 +02:00
xSprite
c765e3d1e7 Add /freekh, /arevive, Chat on Death, fix DeathAdminMsg 2018-10-22 00:16:34 +02:00
hydrant
eb3df74286 Moved death load from connect to login 2018-10-21 23:34:39 +02:00
hydrant
ac11796d30 Moved death load from connect to login 2018-10-21 23:34:39 +02:00
hydrant
78f4919e12 Fixed index.js 2018-10-21 21:48:29 +02:00
hydrant
fc757d04f1 Fixed index.js 2018-10-21 21:48:29 +02:00
hydrant
8ef1ca5e61 Merge Conflicts 2018-10-21 21:48:19 +02:00