Commit Graph

875 Commits

Author SHA1 Message Date
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
hydrant
08774e4c95 Merge Conflicts 2018-10-21 21:48:19 +02:00
hydrant
d4b7ee6dc3 Fixed index.js 2018-10-21 21:46:34 +02:00
hydrant
e73c355181 Fixed index.js 2018-10-21 21:46:34 +02:00
hydrant
618c8cba28 Begin tuning system 2018-10-21 21:45:11 +02:00
hydrant
d4924ddace 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
2b095ff71c 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
6ecbb892cf 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
e1cb5671f8 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
VegaZ
53adfb86b4 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
7e66211728 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
37a5d8861c 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
hydrant
e1e0cfdc45 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
VegaZ
ee767cedec Add DeathScreen 2018-10-21 12:44:34 +02:00
hydrant
1376b10d6f Fixed /givemoney 2018-10-21 12:20:53 +02:00
hydrant
39bda77a9a Fixed /givemoney 2018-10-21 12:20:53 +02:00
xSprite
73a8a5dbf2 test 2018-10-21 05:57:13 +02:00
xSprite
14e5aef46e 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
xSprite
780e602a76 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
66d1328d6b 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
hydrant
6c3383ca2b 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
xSprite
f72ac4519e 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