Commit Graph

972 Commits

Author SHA1 Message Date
Lorenc Pekaj
e7aab90583 add stock 2019-02-17 18:58:21 +11:00
Lorenc Pekaj
24364d6c2d message/prize fixes 2019-02-17 18:22:58 +11:00
Lorenc Pekaj
9cedfbde13 disable walls 2019-02-17 17:12:10 +11:00
Lorenc Pekaj
46a8566dab fix messages 2019-02-17 17:09:35 +11:00
Lorenc Pekaj
dcbadc71dd add more areas 2019-02-17 17:03:27 +11:00
Lorenc Pekaj
2ccd65f172 pickups work, prize pool donate, hide player nametags/cp 2019-02-17 16:03:58 +11:00
Lorenc Pekaj
3a38d75a16 store the gangzone areas into an iterator and use iter_next 2019-02-17 16:01:31 +11:00
Lorenc Pekaj
0cf9853cd7 add donate feature 2019-02-17 12:57:19 +11:00
Lorenc Pekaj
04fca32882 lobby area 2019-02-17 12:25:50 +11:00
Lorenc Pekaj
d45a8e539a invisible walls 2019-02-17 10:29:14 +11:00
Lorenc Pekaj
46554c9417 hide fires on spawn 2019-02-17 10:28:58 +11:00
Lorenc Pekaj
dcfcc35d63 adjust height / hide cps/labels/stuff 2019-02-10 19:20:24 +11:00
Lorenc Pekaj
c6449359e5 destroy entities if exist 2019-02-10 17:21:36 +11:00
Lorenc Pekaj
f54d560244 preset health/armour 2019-02-10 17:17:15 +11:00
Lorenc Pekaj
7b84857a1e add random bombing + start game mechansim 2019-02-10 17:09:15 +11:00
Lorenc Pekaj
4278df30f1 generate random pickup loc and vehicle loc 2019-02-10 12:40:37 +11:00
Lorenc Pekaj
7e135971b7 make gangzone and walls shrink over time 2019-02-10 11:48:47 +11:00
Lorenc Pekaj
66d4295aef create border walls for the area 2019-02-10 00:17:46 +11:00
Lorenc Pekaj
ee210e82a4 plane rotation 2019-02-09 19:45:37 +11:00
Lorenc Pekaj
83cf6a37ba fix edit lobby 2019-02-09 13:27:00 +11:00
Lorenc Pekaj
2ef9f24062 edit area & validation checks 2019-02-06 22:09:44 +11:00
Lorenc Pekaj
a92ce1182c check if player has cash for the entry fee, then debit 2019-02-06 21:58:20 +11:00
Lorenc Pekaj
9448d03b5a edit lobby fields 2019-02-06 21:51:48 +11:00
Lorenc Pekaj
6ead3f3650 start on lobby creation methods / variables 2019-02-05 21:02:23 +11:00
Lorenc Pekaj
81bbfcc82c initial commit battle royale 2019-02-05 20:03:08 +11:00
Lorenc Pekaj
5667a0d870 fix tiny error 2019-02-03 21:29:43 +11:00
Lorenc Pekaj
f8516870c2 fix kova bugs 2019-02-03 21:26:15 +11:00
Lorenc Pekaj
cb853c1be5 colour older changelogs black 2019-02-03 21:25:56 +11:00
Lorenc Pekaj
750fab8abb Merged in changelog (pull request #71)
Changelog
2019-02-03 10:15:18 +00:00
Lorenc Pekaj
a62aae90c4 show changelogs in _changelogs.cfg file 2019-02-03 21:12:41 +11:00
Marin Kovač
f3849a6a86 Merged in gps-vehicle-atm-command (pull request #70)
/gps vehicle/atm
2019-02-03 09:27:16 +00:00
Crova
a15fa28382 Sexying the code 2019-02-03 10:25:33 +01:00
Crova
406d705ae1 Interior check, vehicle id validation 2019-02-03 10:13:39 +01:00
Crova
bb530eb1c9 /gps vehicle/atm 2019-02-03 09:12:45 +01:00
Damen DeBerry
28cfde8b08 Merged in bug-fixes-x (pull request #69)
Hotfix
2019-01-28 01:16:58 +00:00
Damen
52d26259ab further hotfix to dropweapon 2019-01-27 20:16:21 -05:00
Damen DeBerry
f01bb11459 Merged in bug-fixes-x (pull request #68)
Hotfixes
2019-01-28 00:51:12 +00:00
Damen
76b49ebe4b comments out migration file 2019-01-27 19:41:13 -05:00
Damen
199d7734d5 hotfixes for arresting and dropweapon 2019-01-27 18:22:06 -05:00
Lorenc Pekaj
7b6c266604 erase huge string for use 2019-01-27 20:35:22 +11:00
Lorenc Pekaj
a3eee5ae26 move to scriptfiles/changelogs/cnr 2019-01-27 19:52:42 +11:00
Lorenc Pekaj
a2ee7a830e move changes cmd into cnr/changelog.pwn 2019-01-27 19:29:55 +11:00
Damen DeBerry
50b3cdd6ed Merged in bug-fixes-x (pull request #66)
Bug Fixes
2019-01-27 04:02:08 +00:00
Damen
ca0c93bb37 more adjustments based on comments 2019-01-26 22:45:00 -05:00
Damen
f66b4069a1 adds the anti-q-to-avoid system to emp attempts 2019-01-25 19:48:35 -05:00
Damen
7278d113f5 adjustments made per comments and testing 2019-01-25 19:41:05 -05:00
Damen
21455d399f fixes vipjob command to not allow non-job names to be inputted, updates updates.txt with recent commits 2019-01-25 03:15:38 -05:00
Damen
f14e571fb8 fixes info pickup text type for meth van 2019-01-25 02:50:27 -05:00
Damen
8e7e3ce2b8 adds awarding nearest leo whenever quit to avoid or afk wanted, adds checkpoint checks to ensure no-one goes into an interior to q to avoid 2019-01-25 02:47:01 -05:00
Damen
0291b7ddec removes the ability for passive players to enter business vehicles 2019-01-25 01:33:31 -05:00
Damen
3a5a562b8e adjusts passives with association to wanted players and vehicles, including some fixes 2019-01-25 01:04:20 -05:00
Damen
00beb49466 removes the ability for LEOs to purchase a chainsaw, while also reworking certain functions to make them more accessible for global use 2019-01-25 00:18:07 -05:00
Damen
b9066187e6 removes player from player-owned Journeys when they disconnect 2019-01-25 00:02:36 -05:00
Damen
130f1c581e removes the ability to use dirty mechanic commands in a vehicle underwater 2019-01-24 23:48:43 -05:00
Damen
44ccbd825d removes the ability to use player-owned vehicle commands in a vehicle underwater 2019-01-24 23:47:47 -05:00
Damen
ba54a9f72d adjusts the migration error to fix developing work, removes the ability to use animations while using a parachute, fixes weed error OnPlayerDisconnect, removes the ability to gain IC while doing an animation, removes the ability to send IC to spectating admins, adds a variable setter OnPlayerConnect to remove the ability to relog to skip the cooldown timer for Dirty Mechanic 2019-01-24 23:39:34 -05:00
Stev
37b9eade82 Merge branch 'bug-fixes' of https://bitbucket.org/lorenc/cnr into bug-fixes 2019-01-23 20:39:13 +00:00
Stev
76677dad72 increasing house spawn string 2019-01-23 20:36:24 +00:00
Steven Howard
a024d7da66 Merged master into bug-fixes 2019-01-23 20:33:50 +00:00
Lorenc Pekaj
2cf0111d75 address warning with Weed_ResetSellingProperties 2019-01-20 11:15:21 +11:00
Lorenc Pekaj
4da941cd09 reset selling properties weed 2019-01-20 11:14:44 +11:00
Marin Kovač
bf94e5f763 Merged in weed-param (pull request #53)
Weed sell price param
2019-01-19 23:28:55 +00:00
Crova
5b7dfb7558 Fixes a map bug, being able to rob safes without exploding the gates. 2019-01-19 15:31:44 +01:00
Crova
ea176e5928 Removes tax from weed sell/buy 2019-01-19 15:19:37 +01:00
Stev
0682e46559 increasing business production dialog 2019-01-19 13:18:18 +00:00
Damen
1020e0fab2 adds numerous passive-mode checks, adds else-statements prior to if-statements 2019-01-19 00:58:56 -05:00
Crova
6841aa1ee1 Private Rich's casino + actors 2019-01-18 21:57:26 +01:00
Damen DeBerry
ef55564c29 Merged in vip-adjustments (pull request #59)
vipgun adjustment
2019-01-18 10:54:43 +00:00
Damen DeBerry
936d13a6e2 Merged in minor-adjustments (pull request #58)
Minor adjustments
2019-01-18 10:53:57 +00:00
Damen
eba2908ef8 removes knife from VIP lounge 2019-01-17 21:57:37 -05:00
Damen
06fe16d774 add casino damage fix 2019-01-17 20:48:57 -05:00
Damen
a176b9a701 adds check to fix casino damaging players 2019-01-17 20:39:47 -05:00
Damen
2bc361b896 UC acc addition 2019-01-17 02:09:50 -05:00
Damen
bf74d61c67 adjusts speed to attempt pool fix, per owen 2019-01-17 00:31:18 -05:00
Lorenc Pekaj
d1e58ea2aa use player bank getters & setters instead of variable directly 2019-01-16 18:47:31 +11:00
Damen DeBerry
3c04ee5608 Merged in minor-adjustments (pull request #57)
Minor Adjustments
2019-01-16 07:36:10 +00:00
Damen
d78b8dbd3e removes a line i accidentally added when removing timer on arrest 2019-01-16 00:15:29 -05:00
Damen
b10f171af1 adjusts pool timer to attempt physics fix, updates updates.txt 2019-01-15 22:45:11 -05:00
Damen
c78e61e6c7 moves breakout cmd to jail module, adjusts breakcuff success rate 2019-01-15 22:31:15 -05:00
Damen
687bd240f0 fixes bank money saving, moves into it's own function, removes sm limit, increases ic limit to 10,000 2019-01-15 18:04:57 -05:00
Stev
9b3f6f91c7 removing breakcuff code from main into arrest module 2019-01-14 19:54:57 +00:00
Crova
22ae95ca6d Weed sell price param 2019-01-14 12:51:48 +01:00
Lorenc Pekaj
001c387cfb move breakcuff code to module arrest.pwn 2019-01-14 20:39:32 +11:00
Damen
0348faf02d adjusts pool timer from 30 to 25 in attempt to fix physics bug, thought per Owen 2019-01-13 22:20:01 -05:00
Damen
7cb9af3806 adjusts random parameters to 101 and adds additional measures to prevent bc attempts when no longer needed 2019-01-13 12:10:08 -05:00
Damen
9bc63471cb adds KillTimer for arrest, forgot to do when re-did branch 2019-01-13 01:15:48 -05:00
Damen
7eae2186a5 reworks bc, fixes firework purchase, adjusts jail-multiplier 2019-01-13 01:07:16 -05:00
Lorenc Pekaj
1b5c54dc2d /updatedonategoal for lead maintainer to variably adjust the donation requirement per month 2019-01-12 22:27:45 +11:00
Damen DeBerry
936ec548c7 Merged in features-on-acc-creation (pull request #50)
adds features dialog on account creation
2019-01-12 08:46:55 +00:00
Damen
c957e00d40 adds features dialog on account creation 2019-01-12 01:20:28 -05:00
Damen
9ab27f4e31 fixes gang/leo chat message duplication into global chat 2019-01-12 01:06:04 -05:00
Lorenc Pekaj
bf3a2ba9e5 remove debug stuff on the redeem code 2019-01-06 18:49:59 +11:00
Lorenc Pekaj
7ee91d8e6d show % of month funding at the top 2019-01-06 12:06:01 +11:00
Damen
7ce386e6f9 updates business production label upon supply purchases 2019-01-02 13:42:19 -05:00
Lorenc Pekaj
f1993e9d8a disable migration checker if in production mode / disabled in settings 2019-01-02 21:24:46 +11:00
Lorenc Pekaj
941ead4c4c add migration manager ... automatically get errored if your database migrations are not up to date! 2019-01-02 21:20:40 +11:00
Lorenc Pekaj
4aedc7dd5c use jail function in place of variable 2019-01-02 18:54:19 +11:00
Lorenc Pekaj
61597d5bf7 Merged sync-adjust into master 2019-01-02 18:52:41 +11:00
Damen
f835bca30e adds jail check to sync command 2019-01-02 01:07:25 -05:00
Lorenc Pekaj
9ad6354d05 some more error checking in the server var module 2019-01-02 16:37:28 +11:00
Lorenc Pekaj
0532bf946a make server variables module more easy to use 2019-01-02 16:32:59 +11:00
Damen
cbee6e0ab9 adds unforceac offline functionality and lowers restriction to forceac to level 3s 2019-01-01 23:55:47 -05:00
Lorenc Pekaj
9e699d8f9e move billboards and trolley vehicles into its own modules 2019-01-02 03:09:36 +11:00
Lorenc Pekaj
70b04977ca make code consistent in anti money hack module 2019-01-02 03:01:53 +11:00
Lorenc Pekaj
18eb6c9ca6 move money hack code to module 2019-01-02 03:00:54 +11:00
Lorenc Pekaj
39d81a63c7 fix issue with macro in security and use server name definition 2019-01-02 02:59:10 +11:00
Lorenc Pekaj
4e84b19014 move flood control code to security.pwn 2019-01-02 02:55:49 +11:00
Lorenc Pekaj
e5a2013426 remove useless deprecated map editor code 2019-01-02 02:54:05 +11:00
Lorenc Pekaj
515d399ef8 move object code to static object module 2019-01-02 02:53:22 +11:00
Lorenc Pekaj
1427fc0196 move game day code into its own module 2019-01-02 02:51:02 +11:00
Lorenc Pekaj
16b12b4610 code cleanup 2019-01-02 02:37:45 +11:00
Lorenc Pekaj
35f9d15e9b move bunch of functions to helper module 2019-01-02 02:17:39 +11:00
Lorenc Pekaj
bd9168eb76 hook remove buildings 2019-01-02 01:13:48 +11:00
Lorenc Pekaj
0ccc26dbe4 move enterable shamal code to module 2019-01-02 01:11:47 +11:00
Lorenc Pekaj
692f58a1f5 move global taxing into its own module 2019-01-02 00:57:26 +11:00
Lorenc Pekaj
675876a41a move entrance handling to entrance module 2019-01-02 00:51:13 +11:00
Lorenc Pekaj
f1b41098c3 move house, biz, entrance cp handling into module 2019-01-02 00:51:00 +11:00
Lorenc Pekaj
8fae418c13 remove megaban code ... got removed ages back 2019-01-02 00:39:08 +11:00
Lorenc Pekaj
e33b7916ff make NYE feature a tiny bit more pretty for another year 2019-01-02 00:36:14 +11:00
Lorenc Pekaj
f700d2051b modulize banning, registration, login 2019-01-02 00:19:17 +11:00
Lorenc Pekaj
9c8e2ee852 rename login.pwn to player_account.pwn 2019-01-01 23:06:24 +11:00
Lorenc Pekaj
58ee7ae052 move help command to commands/cmd_help.pwn 2019-01-01 23:01:24 +11:00
Lorenc Pekaj
304881b123 remove auto-save feature because it is already automatic now 2019-01-01 22:46:57 +11:00
Lorenc Pekaj
df6c8385b6 gang bank module cleanup 2019-01-01 22:34:25 +11:00
Lorenc Pekaj
bdb6bda5bc * move gang bank, player bank into its own modules
* save player money each time a cash flow occurs (beta)
2019-01-01 22:33:06 +11:00
Lorenc Pekaj
2ed679b149 add OnPlayerMoneyChanged callback 2019-01-01 22:01:46 +11:00
Lorenc Pekaj
fc7aeb2559 move player bugger code as module of anticheat/player_bugger.pwn 2019-01-01 18:38:35 +11:00
Lorenc Pekaj
b19c4be348 move thermal vision fix code as an anticheat module 2019-01-01 18:30:15 +11:00
Lorenc Pekaj
e64ce92566 use mysql_tquery in place of mysql_function_query for helper 2019-01-01 18:28:13 +11:00
Lorenc Pekaj
615dd8f7ab move ticket code into its own module cop/ticket.pwn 2019-01-01 18:20:43 +11:00
Lorenc Pekaj
8875c7654c place bail code in cop/bail.pwn 2019-01-01 18:13:42 +11:00
Lorenc Pekaj
0b2feabcb8 fix nametags and feedback module issue 2019-01-01 18:11:03 +11:00
Lorenc Pekaj
99f6370bd1 add /feedback in its own module 2019-01-01 18:05:12 +11:00
Lorenc Pekaj
2610dd9c19 move /nametags into own module 2019-01-01 18:02:25 +11:00
Lorenc Pekaj
9aada6d568 move highscores cmd as module 2019-01-01 17:58:48 +11:00
Lorenc Pekaj
48f1ececb9 fix broken module 2019-01-01 17:55:07 +11:00
Lorenc Pekaj
89ba340c28 move player note associated code to vip/player_note.pwn 2019-01-01 17:54:34 +11:00
Lorenc Pekaj
e2c168561e move player togglable textdraw stuff to module 2019-01-01 17:27:00 +11:00
Lorenc Pekaj
31f59fd719 fix kova code 2018-12-29 19:26:34 +11:00
Marin Kovač
d1fa7a7f9b Merged in player-objects-fix (pull request #41)
Hardcoded a fix for text by creating a variable for 3 objects
2018-12-29 08:13:28 +00:00
Marin Kovač
027c5ef79c Merged in smallfixes (pull request #42)
Small fixes
2018-12-29 08:13:12 +00:00
Damen DeBerry
c0f98980a6 Merged in knife-removal (pull request #40)
knife-removal
2018-12-29 02:10:24 +00:00
Crova
649b8313b4 Hardcoded a fix for text by creating a variable for 3 objects 2018-12-28 17:27:29 +01:00
Damen
109b62c8cf removes ability to obtain a knife legitimately within the server 2018-12-28 00:18:04 -05:00
Damen
e5aaee0157 adds score requirement of 50 to send a private message (used to avaoid advertisers) 2018-12-27 12:19:21 -05:00
Lorenc Pekaj
8d23fa1c90 use on server update for nye timer 2018-12-27 18:30:50 +11:00
Lorenc Pekaj
6b2aecf757 remove box color on nye textdraws 2018-12-27 18:26:13 +11:00
Lorenc Pekaj
d193e1a10c fix name tags issue 2018-12-27 18:20:46 +11:00
Lorenc Pekaj
d9129b600c fixed issue with player chat message not sending if option enabled 2018-12-27 18:08:12 +11:00
Lorenc Pekaj
5c3445fd1c update version + add cafe 2018-12-27 17:45:46 +11:00
Lorenc Pekaj
1e78bb4481 shortening damens code 2018-12-27 12:57:47 +11:00
Lorenc Pekaj
0be53aab7c making use of TogglePlayerSetting instead of DisablePassiveMode 2018-12-27 12:51:45 +11:00
Damen DeBerry
30b9846d10 Merged in passive-adjustment (pull request #37)
Passive Removal and LEO-Innocent Attacking Protection
2018-12-27 01:46:23 +00:00
Lorenc Pekaj
4c9b65adb0 create TogglePlayerSetting for future use 2018-12-27 12:46:00 +11:00
Lorenc Pekaj
d92241ca20 typo fixes 2018-12-27 00:01:41 +11:00
Lorenc Pekaj
48aa543433 disable xmas update, enable new years module 2018-12-26 23:57:45 +11:00
Stev
0bff900b1b fixes the business member management (removing from business) 2018-12-26 11:08:50 +00:00
Stev
af8fad34ed displaying ID in global chat changeable in settings /cp 2018-12-26 10:02:48 +00:00
Stev
644ed2c5dd listing new command. 2018-12-26 09:48:58 +00:00
Stev
b3f1f160fc variables for /banlog 2018-12-26 09:48:37 +00:00
Damen
e22aa5022b removes passive dialog selection on account creation, adds passive unable to damage vehicles by weapons, adds leos unable to attack innocent vehicles unles they have wanted players alongside them 2018-12-26 01:11:02 -05:00
Stev
0df6f5c686 adds /banlog - admins can search for a ban result from a name. 2018-12-26 00:11:37 +00:00
Stev
b59b5acdd0 fixes mute detection and score detectionf or talking 2018-12-25 23:23:00 +00:00
Stev
25f67e8bdb Merge branch 'fixes' of https://bitbucket.org/lorenc/cnr into fixes 2018-12-25 22:45:36 +00:00
Stev
9278296ee8 hoping the removing business memebers to be resolved. 2018-12-25 22:45:07 +00:00
Crova
67d02b7304 Added fireman command in civilian commands 2018-12-25 22:02:05 +01:00
Stev
99e1c77bb6 code cleaning 2018-12-25 16:35:25 +00:00
Stev
8855e91de7 cleanup 2018-12-25 16:24:09 +00:00
Stev
3504a065d3 reverting the change to fix mute detections. 2018-12-25 16:11:17 +00:00
Crova
afbb67f322 Removes "flying" stairs on Cake's building; http://forum.sfcnr.com/showthread.php?60965-Mapping-BUG 2018-12-25 16:52:22 +01:00
damen
8e2101fad3 adds XP check for firetruck usage 2018-12-25 01:59:13 -05:00
Stev
65fd8ac780 disables spawn protection in pb 2018-12-24 18:22:55 +00:00
Stev
c9464706ef leader detection inside offlinekick 2018-12-23 22:45:15 +00:00
Stev
9b44be62cc co-leaders can use /gang offlinekick 2018-12-23 22:43:43 +00:00
Stev
d1dae5376f fixes /gang offlinekick 2018-12-23 22:11:49 +00:00
Stev
424cb20991 fixes alcatrax checkpoint for mining 2018-12-23 21:11:50 +00:00
Lorenc Pekaj
d2d0bfd8f7 place constants where fit on functions 2018-12-23 17:26:46 +11:00
Lorenc Pekaj
7fe17a317f bug fix with chuff saying random stuff in chat 2018-12-23 12:35:32 +11:00
Lorenc Pekaj
fdd6f4297a rename cmds to stopask stopreport 2018-12-23 12:35:17 +11:00
Lorenc Pekaj
803af66803 move fps code to module 2018-12-23 12:16:55 +11:00
Lorenc Pekaj
98231fdb58 rearrange feature specific modules into appropriate directories 2018-12-23 11:41:04 +11:00
Lorenc Pekaj
50bd48b688 moviemode in its own module 2018-12-23 11:14:28 +11:00
Lorenc Pekaj
4b79a5eba3 move more code associated with vip to its own appropriate modules 2018-12-23 10:58:03 +11:00
Lorenc Pekaj
f98f25ba8c config.php helpers 2018-12-23 10:29:27 +11:00
Lorenc Pekaj
f9c6250764 twitter command moved to /commands folder 2018-12-23 10:24:17 +11:00
Lorenc Pekaj
02ac789629 move /changes to command module 2018-12-23 10:20:13 +11:00
Lorenc Pekaj
4cdfb5fd24 move arrest functions to module 2018-12-23 10:19:38 +11:00
Lorenc Pekaj
08e25e4a5b add server rule setting in config.pwn 2018-12-23 10:13:49 +11:00
Lorenc Pekaj
49d646048b automatically check for inactive stocks at the end of a game day 2018-12-23 09:56:48 +11:00
Lorenc Pekaj
dc699f5523 no wanted level is obtained when entering a gang vehicle (cop maverick) - stev 2018-12-23 01:08:38 +11:00
Lorenc Pekaj
2dada2721c help dialog when purchasing a vehicle only shows if it's your first car. 2018-12-23 01:07:28 +11:00
Lorenc Pekaj
671f66f0b8 gang offline kick 2018-12-23 01:05:23 +11:00
Lorenc Pekaj
de8cca84be moving admins cmd's into _admin.pwn 2018-12-23 00:56:55 +11:00
Lorenc Pekaj
abe07e8be3 passive players with vehicles, can't do damage to others (stev) 2018-12-23 00:47:10 +11:00
Lorenc Pekaj
8d25432f6e made a start on auth modulization but WIP 2018-12-23 00:06:42 +11:00
Lorenc Pekaj
c0ecf96158 move discord commands / functionality to cnr/discord/ 2018-12-22 23:53:42 +11:00
Lorenc Pekaj
68ca399410 move cop chat into cop/cop_chat.pwn 2018-12-22 23:36:05 +11:00
Lorenc Pekaj
04af1f585e begin modulizing cop features in directory features/cop/ 2018-12-22 23:22:29 +11:00
Lorenc Pekaj
e6996d4bb0 passive mode (and spawn protection) placed in passive_mode.pwn 2018-12-22 23:08:20 +11:00
Lorenc Pekaj
1736bfd849 move turf function into its module 2018-12-22 22:50:21 +11:00