Commit Graph

242 Commits

Author SHA1 Message Date
hydrant
55b48e80b2 Changed NativeUi writing 2018-10-24 22:26:24 +02:00
hydrant
449d1c46b2 Added NativeUi 2018-10-24 22:25:17 +02:00
hydrant
23f9838c7f 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
VegaZ
3d3d16f897 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
26e5cc3b5b 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
14a09efae1 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
97ee8f694e 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
6e16db56bd Feature/character creator 2018-10-24 20:51:54 +02:00
hydrant
bf13d7ed4a Added missing semicolon 2018-10-24 20:01:04 +02:00
xSprite
cbaf065663 Add /load 2018-10-23 04:16:13 +02:00
xSprite
e6793f545e 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
c0c38e5bc5 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
1847d46be3 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
eb7f50fd54 Finished tuning system 2018-10-22 22:17:03 +02:00
hydrant
15e1e52b67 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
00975dda33 Fix Duty 2018-10-22 20:19:33 +02:00
VegaZ
e54337a573 Extend death-system 2018-10-22 20:09:14 +02:00
xSprite
4766d25a17 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
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
d6e3d90127 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
78f4919e12 Fixed index.js 2018-10-21 21:48:29 +02:00
hydrant
8ef1ca5e61 Merge Conflicts 2018-10-21 21:48:19 +02:00
hydrant
d4b7ee6dc3 Fixed index.js 2018-10-21 21:46:34 +02:00
hydrant
618c8cba28 Begin tuning system 2018-10-21 21:45:11 +02:00
VegaZ
8ce482db9d Resolve merge conflict 2018-10-21 21:35:34 +02:00
VegaZ
3c947a9288 Merge branch 'feature/deathEvent' into develop 2018-10-21 21:31:51 +02:00
VegaZ
a1feadfd5d Extend Death System; Add Revive-System 2018-10-21 21:31:31 +02:00
VegaZ
614ec855e9 Edit Death System 2018-10-21 15:35:33 +02:00
hydrant
604229210e Removed unnecessary databasecontext on register 2018-10-21 13:03:56 +02:00
hydrant
fa991789ee Edited index.js 2018-10-21 12:49:42 +02:00
hydrant
ab017777ae Removed unnecessary lines in index.js 2018-10-21 12:49:06 +02:00
VegaZ
b72f511702 Add DeathScreen 2018-10-21 12:44:34 +02:00
hydrant
1376b10d6f Fixed /givemoney 2018-10-21 12:20:53 +02:00
xSprite
73a8a5dbf2 test 2018-10-21 05:57:13 +02:00
xSprite
49bd9fb343 Add/Edit some commands, Death.cs, EnterVehicleAttempt.cs 2018-10-21 05:10:54 +02:00
hydrant
cd24928da3 Merge branch 'develop' of ssh://development.life-of-german.org:451/log-gtav/reallife-gamemode into develop 2018-10-21 00:00:38 +02:00
hydrant
723e58d890 Fixed /setmoney (Money is now saved) 2018-10-21 00:00:33 +02:00
xSprite
e10377056f vehicle port on /gotomark, /lt, /rt 2018-10-20 23:50:23 +02:00
hydrant
e54b03502b Added /getincar Command 2018-10-20 18:44:15 +02:00