Commit Graph

541 Commits

Author SHA1 Message Date
Steven Howard
ddbab0f803 Merged master into sync 2018-10-14 09:56:22 +01:00
Steven Howard
2dc9ea5335 vehicle jacking your own vehicle fix 2018-10-14 09:53:49 +01:00
Steven Howard
6dc23cb749 sync system
/s - /sync or ( SPACE & RIGHT CLICK )
2018-10-14 09:51:07 +01:00
Lorenc Pekaj
437c32ee84 update updates.txt 2018-10-14 19:43:30 +11:00
Lorenc Pekaj
7c325bb6eb money dropped in pb 2018-10-14 19:39:53 +11:00
Lorenc Pekaj
17ee715b56 bobby pin reduction 2018-10-14 19:28:29 +11:00
Lorenc Pekaj
f0b62b37ab returning all of the changes i accidentally removed :( 2018-10-14 17:28:52 +11:00
Lorenc Pekaj
75fb809124 fix atm in facility issue 2018-10-14 16:24:58 +11:00
Lorenc Pekaj
2163c29812 Merged in moneygrub (pull request #31)
Moneygrub
2018-10-14 05:14:56 +00:00
Lorenc Pekaj
02974924f4 Merge branch 'moneygrub' of ssh://bitbucket.org/lorenc/cnr into moneygrub 2018-10-14 16:12:24 +11:00
Lorenc Pekaj
0c467299d4 move dispose weapon to weapon_drop 2018-10-14 16:12:00 +11:00
Lorenc Pekaj
749f52ca73 /dropmoney, /dropweapon ... 1% chance drop of armour when you die if ur dm lvl over 50 2018-10-14 16:10:57 +11:00
Lorenc Pekaj
1cfe7cffe6 weed dealers, 10g limit ... dealers can use it 2018-10-14 16:10:06 +11:00
Lorenc Pekaj
31466a89d7 Merged master into moneygrub 2018-10-14 14:07:36 +11:00
Lorenc Pekaj
52a4a44c70 Merged in changes (pull request #30)
Changes
2018-10-14 03:05:30 +00:00
Lorenc Pekaj
9ed5221550 destroy damage object if it exists 2018-10-14 13:38:34 +11:00
Steven Howard
cd86fd9ee5 Merge branch 'changes' of https://bitbucket.org/lorenc/cnr into changes 2018-10-13 17:20:30 +01:00
Steven Howard
18ff02951b hidden syncing for the time being 2018-10-13 17:06:06 +01:00
Steven Howard
7330028a6c Merged master into changes 2018-10-13 17:04:54 +01:00
Steven Howard
7d0d72260b global object replacement 2018-10-13 17:04:32 +01:00
Lorenc Pekaj
c2085bcdd2 updates.txt update 2018-10-14 01:55:53 +11:00
Steven Howard
3fe2638959 textdraw changes 2018-10-13 15:44:04 +01:00
Lorenc Pekaj
7606829ff9 fix moviemode bug with xp bs showing wrongly 2018-10-14 01:43:21 +11:00
Steven Howard
76d2629b0a starting sync player. 2018-10-13 15:38:02 +01:00
Lorenc Pekaj
fdb9f9aa77 hit amount amount bug fix in interior (label) 2018-10-14 01:36:32 +11:00
Steven Howard
aeabfdcdf5 removed unused function 2018-10-13 14:16:59 +01:00
Steven Howard
ad8a8b9385 removes invalid defines 2018-10-13 14:15:48 +01:00
Steven Howard
c15ea9ef49 adds /viewpolicechat for level 5 admins 2018-10-13 14:11:21 +01:00
Lorenc Pekaj
9c49fa35b4 passive disables deathmatch 2018-10-14 00:08:22 +11:00
Steven Howard
e46ece5ace removes invalid vehicles
http://forum.sfcnr.com/showthread.php?60671-Infernus-placements
2018-10-13 14:07:39 +01:00
Lorenc Pekaj
763689448f damage feed improvements 2018-10-13 23:21:05 +11:00
Steven Howard
812e0b2397 Merged in damage_feed (pull request #29)
Damage feed
2018-10-13 11:32:57 +00:00
Steven Howard
0e080fcd7c 3d text is attached to damaged player
lifted the object above player name
2018-10-13 11:44:55 +01:00
Steven Howard
3c4bab5596 Merge branch 'damage_feed' of https://bitbucket.org/lorenc/cnr into damage_feed 2018-10-13 11:18:09 +01:00
Steven Howard
da428e56b6 cleaning up invalid prints and comments 2018-10-13 11:15:35 +01:00
Steven Howard
bcff7701ab Merged master into damage_feed 2018-10-13 11:13:23 +01:00
Steven Howard
3f96fe199b changed from object to a SetPlayerAttachedObject 2018-10-13 11:12:08 +01:00
Steven Howard
dd9a68eaa4 adds a object above the players head according to what damage has been given (armour and/or health)
Inspired by Shini
2018-10-12 23:04:18 +01:00
Steven Howard
52146a04d2 attachs a 3D text label where the player damaged a player (known from dming) 2018-10-12 22:13:07 +01:00
Steven Howard
b74ab57bdf removes vip requirement to change hitmarker sounds 2018-10-12 17:04:19 +01:00
Steven Howard
bdb45e28d8 moves hitmarkersound into damage_feed.pwn
cleanup
2018-10-12 17:00:44 +01:00
Steven Howard
0250296b2b changes textdraw colors 2018-10-12 15:59:20 +01:00
Lorenc Pekaj
c45e66e6bb fix admin spec issue 2018-10-13 01:12:47 +11:00
Lorenc Pekaj
b73f2bb9e4 replace hitmarker with damage feed 2018-10-13 01:12:27 +11:00
Steven Howard
7fde0d019e player change 2018-10-12 15:07:26 +01:00
Lorenc Pekaj
23fc8aa608 spectate check for player 2018-10-13 00:49:38 +11:00
Steven Howard
44f16fcc3d changing targetid 2018-10-12 11:56:56 +01:00
Lorenc Pekaj
b182e49b2b drop money on death 2018-10-12 21:39:20 +11:00
Lorenc Pekaj
f5e1a4565c moviemode xp tds moved to experience.pwn 2018-10-12 20:26:35 +11:00
Lorenc Pekaj
ecf10abe5c new rank system is largely based off the new xp system 2018-10-12 20:01:32 +11:00