Commit Graph

234 Commits

Author SHA1 Message Date
VegaZ
adede0b3ea Update index.js 2018-10-24 21:31:56 +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
3a4b210f87 Added Custom Names for tuning parts 2018-10-24 21:08:04 +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
ae6801cedb Feature/character creator 2018-10-24 20:51:54 +02:00
hydrant
5d581ed66d Added missing semicolon 2018-10-24 20:01:04 +02:00
xSprite
d7db2d7565 Add /load 2018-10-23 04:16:13 +02:00
xSprite
af21e3d4c8 Add /aneon, /vehsmoke 2018-10-23 02:39:55 +02:00
hydrant
ca14bff601 Improved tuning display texts 2018-10-23 01:09:22 +02:00
hydrant
3173fab98a Removed textlabels, Fixed chat not showing up after exiting tuning menu 2018-10-22 22:46:19 +02:00
hydrant
43211a5eea Removed unnecessary command 2018-10-22 22:20:48 +02:00
hydrant
42755fa935 Merge branch 'feature/tuning-system' into develop 2018-10-22 22:19:44 +02:00
hydrant
4ed07d6ffb Removed wrong files 2018-10-22 22:18:33 +02:00
hydrant
d667406a5c Finished tuning system 2018-10-22 22:17:03 +02:00
hydrant
b99eaa4f77 Added tuning menu 2018-10-22 21:42:33 +02:00
VegaZ
08646c723d Fix merge conflicts 2018-10-22 20:22:45 +02:00
VegaZ
80f23866f7 Fix Duty 2018-10-22 20:19:33 +02:00
VegaZ
2474033513 Extend death-system 2018-10-22 20:09:14 +02:00
xSprite
e8caca16eb fix freekh 2018-10-22 00:37:40 +02:00
xSprite
5580d06b09 fix freekh, change login death 2018-10-22 00:30:21 +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
c765e3d1e7 Add /freekh, /arevive, Chat on Death, fix DeathAdminMsg 2018-10-22 00:16:34 +02:00
hydrant
ac11796d30 Moved death load from connect to login 2018-10-21 23:34:39 +02:00
hydrant
fc757d04f1 Fixed index.js 2018-10-21 21:48:29 +02:00
hydrant
08774e4c95 Merge Conflicts 2018-10-21 21:48:19 +02:00
hydrant
e73c355181 Fixed index.js 2018-10-21 21:46:34 +02:00
hydrant
d4924ddace Begin tuning system 2018-10-21 21:45:11 +02:00
VegaZ
2b095ff71c Resolve merge conflict 2018-10-21 21:35:34 +02:00
VegaZ
6ecbb892cf Merge branch 'feature/deathEvent' into develop 2018-10-21 21:31:51 +02:00
VegaZ
e1cb5671f8 Extend Death System; Add Revive-System 2018-10-21 21:31:31 +02:00
VegaZ
53adfb86b4 Edit Death System 2018-10-21 15:35:33 +02:00
hydrant
7e66211728 Removed unnecessary databasecontext on register 2018-10-21 13:03:56 +02:00
hydrant
37a5d8861c Edited index.js 2018-10-21 12:49:42 +02:00
hydrant
e1e0cfdc45 Removed unnecessary lines in index.js 2018-10-21 12:49:06 +02:00
VegaZ
ee767cedec Add DeathScreen 2018-10-21 12:44:34 +02:00
hydrant
39bda77a9a Fixed /givemoney 2018-10-21 12:20:53 +02:00
xSprite
14e5aef46e test 2018-10-21 05:57:13 +02:00
xSprite
780e602a76 Add/Edit some commands, Death.cs, EnterVehicleAttempt.cs 2018-10-21 05:10:54 +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
6c3383ca2b Fixed /setmoney (Money is now saved) 2018-10-21 00:00:33 +02:00
xSprite
f72ac4519e vehicle port on /gotomark, /lt, /rt 2018-10-20 23:50:23 +02:00
hydrant
c417c68aa1 Added /getincar Command 2018-10-20 18:44:15 +02:00
hydrant
0c408bcfc8 Fixed /setmoney 2018-10-20 18:18:37 +02:00
hydrant
c2740d0c64 Fixed money transfer 2018-10-20 18:11:40 +02:00
hydrant
30ada7aeda Fixed money display #1 2018-10-20 17:51:03 +02:00
hydrant
36b3a56401 Added ID check on ClientService.GetClientByName 2018-10-20 17:19:05 +02:00
hydrant
534a6bec71 Added error message to /gotomark if no mark is set 2018-10-20 15:45:56 +02:00
VegaZ
3432b46d05 Add /mark & /gotomark 2018-10-19 16:13:39 +02:00
xSprite
1ada79ba73 whitelist add 2018-10-18 20:14:46 +02:00
xSprite
35bb1eb004 whitelist add 2018-10-18 20:03:07 +02:00