Commit Graph

326 Commits

Author SHA1 Message Date
Lorenc Pekaj
75fb809124 fix atm in facility issue 2018-10-14 16:24:58 +11: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
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
31466a89d7 Merged master into moneygrub 2018-10-14 14:07:36 +11:00
Lorenc Pekaj
9ed5221550 destroy damage object if it exists 2018-10-14 13:38:34 +11:00
Steven Howard
18ff02951b hidden syncing for the time being 2018-10-13 17:06:06 +01:00
Steven Howard
7d0d72260b global object replacement 2018-10-13 17:04:32 +01:00
Steven Howard
3fe2638959 textdraw changes 2018-10-13 15:44:04 +01:00
Steven Howard
76d2629b0a starting sync player. 2018-10-13 15:38:02 +01: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
Lorenc Pekaj
763689448f damage feed improvements 2018-10-13 23:21:05 +11: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
ecf10abe5c new rank system is largely based off the new xp system 2018-10-12 20:01:32 +11:00
Steven Howard
f179841d38 changed timer durations based on ticks 2018-10-11 16:44:11 +01:00
Steven Howard
110458523d changing functions for given/taken feed 2018-10-11 16:36:56 +01:00
Steven Howard
45dcae630d puching all hitsound configuration into one 2018-10-11 14:35:21 +01:00
Steven Howard
598b0c6fda adding hitmarker textdraw into damage_feed file.
cleanup variables
2018-10-11 14:21:51 +01:00
Steven Howard
a57114f4c1 textdraw placements 2018-10-11 14:06:18 +01:00
Lorenc Pekaj
f4a6e08428 fix issue with players losing their biz checkpoints when someone quits 2018-10-12 00:03:57 +11:00
Steven Howard
5c635493e7 cleanup 2018-10-11 11:26:41 +01:00
Steven Howard
71dc423e88 added callback to return the damage given/taken 2018-10-11 11:26:08 +01:00
Steven Howard
0405aa45a4 remove invalid defines 2018-10-11 11:13:17 +01:00
Steven Howard
9d3fc9838e moved into features
changed the colors of textdraws
2018-10-11 11:10:16 +01:00
Lorenc Pekaj
3ad50aec5e move spike strip in car key to H/CAPSLOCK 2018-10-11 20:24:21 +11:00
Lorenc Pekaj
05cd9b1722 fire system retouched - use /fires ... based off map icons ... no more textdraws 2018-10-11 20:19:30 +11:00
Lorenc Pekaj
3524501d76 address issue with player unable to rob chuff ... move progress bar data there 2018-10-10 20:05:55 +11:00
Lorenc Pekaj
cca1f347f1 modulize car jacker 2018-10-10 19:36:08 +11:00
Lorenc Pekaj
cc23d6ced4 modulize fire system 2018-10-10 19:20:25 +11:00
Lorenc Pekaj
098d259a5a use aim key to set spike in car ... disabled for air/boat 2018-10-10 19:04:08 +11:00
Lorenc Pekaj
889f8bf946 modulize streaks and weapon statistics 2018-10-10 16:05:23 +11:00
Lorenc Pekaj
c652ac40e2 GetPlayerOutsidePos will give you the entrance/house/garage/pos the player is at 2018-10-10 16:05:14 +11:00
Lorenc Pekaj
c3ce372f9f modulize atm system and crime report system 2018-10-10 15:21:11 +11:00
Lorenc Pekaj
7f69b7427f move car mod checker as an anticheat module... move charging for vehicle components in the anticheat money module 2018-10-10 14:59:03 +11:00
Lorenc Pekaj
97d4c8a40a modulize information pickups 2018-10-10 14:50:16 +11:00
Lorenc Pekaj
233b913fe6 modulize bribes 2018-10-10 14:46:38 +11:00
Lorenc Pekaj
f392745ec6 modulize roadblock system 2018-10-10 14:35:08 +11:00
Lorenc Pekaj
2e0d92f2a7 mining minijob modulized 2018-10-10 14:30:35 +11:00
Lorenc Pekaj
4feea47631 remove useless modules ... modulize weapon lockers 2018-10-10 14:08:18 +11:00
Lorenc Pekaj
1a7d8695d2 validate house id and biz id in confirmation dialogs ... update updates.txt 2018-10-10 12:19:18 +11:00
Lorenc Pekaj
3b28c1b30f little bit faster to place the drills now 2018-10-10 12:11:07 +11:00
Lorenc Pekaj
be16355bee make hide from radar last one minute 2018-10-10 12:00:29 +11:00
Steven Howard
3483bc358b changed some level req values 2018-10-09 14:18:32 +01:00
Steven Howard
07b2d25182 adds stealth mode (hides player from radar)
once player is shot he shows for a short period (like CIA)
2018-10-09 14:15:35 +01:00
Steven Howard
a65c2cf9b5 added train missions to database
updated highscores to have train missions
added achievements for train driver aswell
2018-10-09 10:49:11 +01:00
Steven Howard
120c5b09c2 updated pilot sql schematic 2018-10-09 10:13:25 +01:00
Steven Howard
2d1094574c adds a confirmation dialog before selling a business 2018-10-09 10:09:15 +01:00
Steven Howard
590da61131 addressed mmb for arresting issue
pilot missions are added into achievements and saves in sql
2018-10-09 09:53:55 +01:00
Steven Howard
7f4a463235 adds a confirmation dialog before selling a house 2018-10-09 09:32:26 +01:00
Steven Howard
91bf3157a0 adds a confirmation dialog before selling vehicle modifications 2018-10-09 08:49:53 +01:00
Steven Howard
02f105c5c4 reformatted all dialog id's and ordered them 2018-10-09 08:30:55 +01:00
Lorenc Pekaj
f93b76d4f9 change zero's skin 2018-10-09 11:02:44 +11:00
Lorenc Pekaj
8c2dd222d2 add toy model preview 2018-10-09 10:33:04 +11:00
Lorenc Pekaj
b755e6ffa1 add /smoke to animlist 2018-10-09 10:26:33 +11:00
Lorenc Pekaj
a4cf751cec add model preview functionality ... makes previewing models before buying seamless 2018-10-09 10:04:42 +11:00
Steven Howard
e33c2c3efb adds a option to preview a garage component before buying 2018-10-08 22:41:29 +01:00
Steven Howard
108fc055a6 adds /smoke into animations 2018-10-08 20:53:05 +01:00
Steven Howard
d1f4ab1ecb reformatted paintball edit dialog
added a chat toggle option to enable/disable pb chat
2018-10-08 13:58:52 +01:00
Steven Howard
4412650371 vehicle dealership spawn location fixes 2018-10-08 13:31:44 +01:00
Lorenc Pekaj
f0d793d4fc speed up robbery time with thermal drill 2018-10-08 21:36:19 +11:00
Lorenc Pekaj
53d7f274e8 increase payout for robberies 2018-10-08 21:34:45 +11:00
Lorenc Pekaj
43525a52aa store progress bar in progress.pwn and use progressbarv2 2018-10-08 21:02:19 +11:00
Lorenc Pekaj
6b3cb411cf adjust clerk xp credit 2018-10-08 21:02:03 +11:00
Lorenc Pekaj
aa00cd6346 address issue with clerks giving too much xp 2018-10-06 12:54:20 +10:00
Lorenc Pekaj
1ea84952ae move toys into toys module cnr\features\toys.pwn 2018-10-06 12:11:26 +10:00
Lorenc Pekaj
19446fd230 move shop data to module shops.pwn (supasave) 2018-10-06 11:59:34 +10:00
Lorenc Pekaj
b4bd152bae add back all robbery npcs ... drop the pay of safes by a tiny bit 2018-10-06 11:14:18 +10:00
Lorenc Pekaj
41489478b7 modulize entrances, jobs, robbery npcs, robbery safes, vaults 2018-10-06 10:50:23 +10:00
Lorenc Pekaj
cbc7e6a429 drop health according to dm level 2018-10-05 16:50:05 +10:00
Lorenc Pekaj
b245112594 reduce turf pay by 500, increase facility spawn fee by 250 (gangs) 2018-10-05 16:37:53 +10:00
Lorenc Pekaj
16fd59d78a improve business payouts ... significantly 2018-10-05 16:32:19 +10:00
Lorenc Pekaj
7d83b8bccb add chainsaw pickup ... remove dialog for lumberjack 2018-10-05 16:32:01 +10:00
Lorenc Pekaj
fd1d42d961 remove duplicate inc on pool ... updates.txt update 2018-10-05 03:58:08 +10:00
Lorenc Pekaj
a3d7673072 increase facility limit 2018-10-04 06:09:51 +10:00
Lorenc Pekaj
8f6a417b6b fix business bug with supplies 2018-10-04 06:02:52 +10:00
Lorenc Pekaj
8a2f312bb5 perks cleanup 2018-10-04 05:47:29 +10:00
Lorenc Pekaj
233d83cf39 charge gangs $250 per spawn on their facility 2018-10-04 05:44:45 +10:00
Lorenc Pekaj
c4e50c8bfc add perks based off total level and make it expensive ...
dm experience now varies between the weapon
2018-10-04 05:35:04 +10:00
Lorenc Pekaj
0f4aee7915 solve issue with saved biz vehicles showing unpurchased 2018-10-01 14:39:08 +10:00
Lorenc Pekaj
65cc786fa0 error fix and update changelog 2018-10-01 14:25:54 +10:00
Lorenc Pekaj
a8bba4c4e4 update description 2018-10-01 14:20:08 +10:00
Lorenc Pekaj
0ce410a1ba business production timer now relies on players online 2018-10-01 14:18:16 +10:00
Lorenc Pekaj
26a860dab3 modulize business system and disable business security 2018-10-01 13:30:25 +10:00
Lorenc Pekaj
487cecf314 modulize spike strips ... left alt to deploy spike strip 2018-09-30 03:37:42 +10:00
Lorenc Pekaj
31b67c20e4 add pagination to realestate (/estate) ... can support hundreds of homes now 2018-09-30 03:14:56 +10:00
Lorenc Pekaj
2e56a7bb57 error fix with random msgs 2018-09-29 06:08:36 +10:00
Lorenc Pekaj
556a008573 move player market cmds to /ic 2018-09-29 06:05:39 +10:00
Lorenc Pekaj
f81d656161 start with just police, robbery, dm levels 2018-09-29 04:44:18 +10:00
Lorenc Pekaj
09d8e0a1c1 fix animation bug 2018-09-26 14:16:15 +10:00
Lorenc Pekaj
4bf6b8f33e introduce OnPlayerFirstSpawn( p ), OnPlayerMoveMode( p, t ) ... move animation to /features/animations.pwn 2018-09-26 14:04:39 +10:00
Lorenc Pekaj
3bc77224c5 make gold vip 1.8k ic per month ... add custom estate to ic market 2018-09-26 04:09:20 +10:00
Lorenc Pekaj
cdfe84671d allow players over the vip limit to utilize their houses/vehicles 2018-09-26 00:23:25 +10:00
Lorenc Pekaj
3d54f3f266 random msg for stephanie and estate 2018-09-25 23:50:01 +10:00
Lorenc Pekaj
c535ca1796 fix potential sql injection vulernability :O 2018-09-25 23:46:30 +10:00
Lorenc Pekaj
df5038457e fix crowdfund SQL error 2018-09-25 23:36:53 +10:00
Lorenc Pekaj
1c70a050e3 compile error and add back in pool 2018-09-25 23:28:31 +10:00
Lorenc Pekaj
4c93b2e888 include house name in realestate sale 2018-09-25 23:12:41 +10:00
Lorenc Pekaj
039452310d move garage code to module 2018-09-25 13:58:21 +10:00
Lorenc Pekaj
a6a7f00c52 check if player is over slot limit before buying premium home 2018-09-25 13:32:52 +10:00
Lorenc Pekaj
06fd6b742b fix /reconnectchuff 2018-09-25 13:32:36 +10:00
Lorenc Pekaj
27e8f154d6 Merged realestate_listings into master 2018-09-25 12:42:45 +10:00
Lorenc Pekaj
57a1db8cd8 move command to /estate for now 2018-09-25 12:42:20 +10:00
Steven Howard
78f3a89a95 cleaning and updating callbacks 2018-09-24 22:21:20 +01:00
Lorenc Pekaj
2bb7604548 Add callback OnHouseOwnerChange 2018-09-25 03:46:21 +10:00
Lorenc Pekaj
308ea77b57 create listing ingame and delete listing ingame functionality 2018-09-25 02:55:03 +10:00
Lorenc Pekaj
5b51577922 modify schema 2018-09-25 02:54:45 +10:00
Lorenc Pekaj
f49e4a07de check if the home was sold already before filling a purchase 2018-09-25 02:14:10 +10:00
Lorenc Pekaj
96613ed3a0 you can now buy homes directly off /houselistings ... and set a waypoint to the home that is of interest 2018-09-25 02:06:53 +10:00
Lorenc Pekaj
dff542823a begin real estate listings 2018-09-25 00:35:46 +10:00
Lorenc Pekaj
d85c80f750 Stephanie message for passive mode and if you get wanted, automatically reset passive mode 2018-09-24 23:03:37 +10:00
Lorenc Pekaj
0009a4f069 adds GPS_SetPlayerWaypoint 2018-09-24 22:51:17 +10:00
Lorenc Pekaj
11b0621e13 adds passive mode, readjust settings (see updates.txt) 2018-09-24 18:18:07 +10:00
Lorenc Pekaj
69545b23b2 * fixes /v bring bug
* adds different colors in /viplist
* adds /goto detection for players that are spectating
2018-09-24 11:29:48 +10:00
Lorenc Pekaj
aa98e5b77c - move player settings into seperate module
- add OnPlayerLogin (hookable)
- add setting to disable auto weapon pickup
2018-09-23 14:56:34 +10:00
Lorenc Pekaj
440d82de1c move ammunation, ig guard, vip to /cnr 2018-09-23 14:55:47 +10:00
Lorenc Pekaj
ccfbc7ec43 move vip, ig guard, ammunation to /cnr/ and disable pool temporarily 2018-09-23 14:55:13 +10:00
Lorenc Pekaj
345c6938e7 fix kovas table and hide help dialog when u get removed 2018-09-20 19:32:01 +10:00
Lorenc Pekaj
39228157bc add stev and kova's pool tables 2018-09-20 08:57:20 +10:00
Lorenc Pekaj
6fa16ab50d remove test command on the traindriver minijob 2018-09-20 00:25:15 +10:00
Lorenc Pekaj
9c139f24af code error fix with pool 2018-09-19 23:04:08 +10:00
Lorenc Pekaj
99903baeb0 pool balls shot will not stop during movement 2018-09-19 23:01:59 +10:00
Lorenc Pekaj
d20ea0d682 fix meth bug where keys were not responsive 2018-09-19 22:54:57 +10:00
Lorenc Pekaj
875bc6c7b2 train driver fixes 2018-09-19 17:51:10 +10:00
Lorenc Pekaj
b1ab562e69 store gps information in module ... need to investigate a negative tickcount issue 2018-09-19 15:14:04 +10:00
Lorenc Pekaj
46dedc1192 fixes some errors, forgot to save the files lol 2018-09-19 11:25:10 +10:00
Lorenc Pekaj
d4bd8124b6 lumberjack in minijobs module ... and update readme 2018-09-19 11:14:18 +10:00
Lorenc Pekaj
3da90fda9a move crowdfund dialog ids to dialog_ids 2018-09-19 09:49:59 +10:00
Lorenc Pekaj
f69bb040d5 add vdealership description 2018-09-19 09:47:53 +10:00
Lorenc Pekaj
4ca207c648 * place vehicle, garage, vehicle dealer, vehicle modification into modules (features/vehicles) 2018-09-19 09:41:56 +10:00
Steven Howard
d6a6e749d8 Merged master into traindriver 2018-09-18 14:20:48 +01:00
Lorenc Pekaj
a5679e5d9d sql error addressed w/ crowdfunds 2018-09-18 07:26:18 +10:00
Steven Howard
023372016f added speed detection when entering the checkpoint (forcing the driver to slow down)
re-worded some help dialogs
fixed the loading passagers messages
2018-09-17 19:03:16 +01:00
Lorenc Pekaj
9f81391323 pool issue with exiting table while not even in it, fixed 2018-09-17 18:30:14 +10:00
Lorenc Pekaj
39ca88ec1f pool fixes 2018-09-17 12:50:25 +10:00
Lorenc Pekaj
f0f5595a1e Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr 2018-09-17 11:39:14 +10:00