Commit Graph

470 Commits

Author SHA1 Message Date
Steven Howard
fee1305492 added CIA detection on OnPlayerTakePlayerDamage, fixes vehicle CIA blip issues. 2018-09-18 19:37:52 +01: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
e493eca59e wanted if you aim at a cop 2018-09-17 12:50:38 +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
Steven Howard
357e059631 traindriver.pwn edited 2018-09-17 00:03:46 +00:00
Steven Howard
051f5cf6af added traindriver minijob 2018-09-17 01:01:01 +01:00
Lorenc Pekaj
f43ffae631 specific pilot vehicles pay more ... wanted level given for harder jobs 2018-09-17 08:23:04 +10:00
Lorenc Pekaj
c57067199d more pool skins for crowdfund patreons 2018-09-17 08:22:45 +10:00
Lorenc Pekaj
5b05305b17 Merge branch 'master' of ssh://bitbucket.org/lorenc/cnr 2018-09-17 05:58:02 +10:00
Lorenc Pekaj
cde58d1c67 bugfixes 2018-09-17 05:57:14 +10:00
Steven Howard
22532b95f1 fixes "/pb leave" 2018-09-16 15:47:22 +01:00
Steven Howard
2b0f96e0d1 Revert "adds different cargo names and the risk level."
This reverts commit 018f5f4e34.
2018-09-16 14:16:59 +01:00
Steven Howard
018f5f4e34 adds different cargo names and the risk level. 2018-09-16 14:16:48 +01:00
Lorenc Pekaj
d2d9be73de add custom pool skin param 2018-09-16 17:04:45 +10:00
Lorenc Pekaj
3f47179dba code cleanup on the casino parts 2018-09-16 16:49:26 +10:00
Lorenc Pekaj
1c2b4236be more plane models to export for 2018-09-16 16:49:10 +10:00
Lorenc Pekaj
bd8b584cb3 bug fixes 2018-09-16 16:06:12 +10:00
Lorenc Pekaj
c3162a0d96 add "/p leave" 2018-09-16 16:05:38 +10:00
Lorenc Pekaj
a59326f0a3 replace number_format with cash_format 2018-09-16 16:05:27 +10:00
Lorenc Pekaj
6e79b82423 remove "sscanf_u" in some modules that it was not removed from 2018-09-16 15:35:17 +10:00
Lorenc Pekaj
7ea55e0743 convert more player textdraws (that use global td) to actual player textdraw 2018-09-16 15:34:42 +10:00
Steven Howard
af30a89914 including pilot into script 2018-09-15 21:35:02 +01:00
Steven Howard
f74b61ff52 increased the drop off checkpoint by 0.5 units 2018-09-15 21:31:37 +01:00
Steven Howard
5548bd4544 added risk element into pilot job
added parameters into "/pilot [NORMAL/HARDER/STOP]"
fixed all related bugs according to bangs
2018-09-15 21:15:24 +01:00
Lorenc Pekaj
5bc7b36b1c reposition commands in pool script 2018-09-15 12:32:32 +10:00
Lorenc Pekaj
87f4163b97 fix pool issues and add protection against pool players for rob, kill, etc.. 2018-09-15 12:26:54 +10:00
Lorenc Pekaj
0e507bad49 Merged in pool-system (pull request #12)
Pool system
2018-09-15 02:07:51 +00:00
Lorenc Pekaj
91463f020b if player distant from pool, auto removed from table. lot of bug fixes 2018-09-15 12:06:35 +10:00
Lorenc Pekaj
22f69ca1be setlevel was not working for level 6 ... moved server defs to _config 2018-09-15 12:05:53 +10:00
Lorenc Pekaj
0a18215da9 if a player pockets the cue ball, the next player will be able to set it next turn 2018-09-14 21:10:29 +10:00
Lorenc Pekaj
3db3ec2731 add system for waging pool 2018-09-14 19:56:07 +10:00
Lorenc Pekaj
da1f2f91bf no longer can jump on top of the table to shoot
instructions given to first player that joins the table
cleanup
2018-09-14 19:12:39 +10:00
Lorenc Pekaj
f9d2262b58 animation fixes for pool 2018-09-14 18:00:41 +10:00
Lorenc Pekaj
a8c06186a4 format messages and let him keep the pool cue 2018-09-14 08:38:40 +10:00
Lorenc Pekaj
c8b143f65b if a player shoots a pool ball, restore the ball's position and desync the shot 2018-09-14 07:57:25 +10:00
Lorenc Pekaj
1301f7ef0a remove pool table from player home (panther) 2018-09-14 07:42:26 +10:00
Lorenc Pekaj
3323e7f39e fixes turn issue when you pocket several balls 2018-09-14 07:42:15 +10:00
Steven Howard
7a007cb058 Merged in pilot-minijob (pull request #10)
rebuilding pilot minijob, fully tested and working, attempted cleaning aswell

Approved-by: Lorenc Pekaj <pekajlorenc@gmail.com>
2018-09-13 21:39:43 +00:00
Steven Howard
01b0cb3372 Merge branch 'houses-bugs' of https://bitbucket.org/lorenc/cnr into houses-bugs
# Conflicts:
#	gamemodes/irresistible/cnr/features/houses/house.pwn
2018-09-13 09:54:45 +01:00
Steven Howard
180ae973e4 reverting changes 2018-09-13 09:32:53 +01:00
Steven Howard
d461e85298 Revert "changed /h config dialog to show current value"
This reverts commit 7623bdc17b.
2018-09-13 09:19:57 +01:00
Steven Howard
7623bdc17b changed /h config dialog to show current value 2018-09-13 09:17:24 +01:00
Steven Howard
abd26b8ef1 fixed bugs when player enters password into a house and automatically spawns outside the house
http://forum.sfcnr.com/showthread.php?58726-House-password-bug
2018-09-13 00:01:49 +01:00
Steven Howard
584f730db3 rebuilding pilot minijob, fully tested and working, attempted cleaning aswell 2018-09-12 23:29:47 +01:00
Lorenc Pekaj
5445f06968 removes pool cmd ... simply enter to join pool table, laser placed for where 8ball should go towards ending a game 2018-09-13 07:38:47 +10:00
Lorenc Pekaj
60c098abd2 move clearchat feature to helpers 2018-09-13 04:03:16 +10:00
Lorenc Pekaj
21aeeed965 add penalities for pocketing white / opposition + chalk as soon as you press key fire 2018-09-13 02:52:39 +10:00
Lorenc Pekaj
e01a3a4bfe add/remove players using foreach and optimizations 2018-09-13 01:16:26 +10:00
Lorenc Pekaj
ff9ee58d55 detects ball type and number 2018-09-12 10:59:04 +10:00
Steven Howard
8637b7b077 changing number_format to cash_format for cash related 2018-09-12 00:31:22 +01:00
Lorenc Pekaj
e317d90417 move constants to top 2018-09-12 08:32:42 +10:00
Lorenc Pekaj
1ba5cc5290 pool offsets perfected (walls and holes) 2018-09-12 08:08:23 +10:00
Steven Howard
94640d40a4 adding pilot minijob (cargo delivery from static place to random airport) 2018-09-11 14:34:16 +01:00
Lorenc Pekaj
8c139b7033 pool cleanup 2018-09-11 21:40:45 +10:00
Steven Howard
66245b1e7c pool.pwn edited the module name 2018-09-11 10:29:45 +00:00
Steven Howard
fb181bd148 adding pool minigame (modular) 2018-09-11 11:27:54 +01:00
Lorenc Pekaj
070770ad22 chuffsec module can be commented to disable now 2018-09-11 18:17:37 +10:00
Lorenc Pekaj
759ee28afb thrown more items into the fps module 2018-09-11 17:40:36 +10:00
Lorenc Pekaj
a99e86216b modularize chuffsec 2018-09-11 17:30:24 +10:00
Lorenc Pekaj
3e739ffd48 forgot to fill the description of the meth minijob 2018-09-11 08:49:23 +10:00
Lorenc Pekaj
736cba6171 modulize meth minijob 2018-09-11 08:41:42 +10:00
Lorenc Pekaj
2cff1b8bb1 modulize trucking system 2018-09-11 08:29:50 +10:00
Lorenc Pekaj
64923afd6d OnServerUpdate & OnPlayerUpdateEx now hookable 2018-09-11 08:01:18 +10:00
Lorenc Pekaj
97b129e2fe vending machine bug fix 2018-09-11 07:58:33 +10:00
Lorenc Pekaj
4df1a7561d modulize vending machines and thrown into anticheat package 2018-09-11 07:29:38 +10:00
Lorenc Pekaj
d5a9c7f8a3 server-sided money is now a part of the anticheat modules 2018-09-11 07:15:04 +10:00
Lorenc Pekaj
eeb3a33e8b finish modulizing slot machines 2018-09-11 06:48:22 +10:00
Lorenc Pekaj
1cfd945d4b modulize random messages (stephanie), begin modulizing slots 2018-09-11 06:33:18 +10:00
Lorenc Pekaj
fa715f46b1 make easter egg system modular (and disabled for now) 2018-09-11 06:16:36 +10:00
Lorenc Pekaj
4cd8168fa3 store valid car mod data in gta folder 2018-09-11 05:58:22 +10:00
Steven Howard
271ecbe713 change duel system styling for ease of use 2018-09-10 20:00:02 +01:00
Lorenc Pekaj
95f4957f9a changed to cash_format() to style numbers into money and fixes a bug with formatting negative numbers 2018-09-11 03:44:05 +10:00
Lorenc Pekaj
835618c940 removes useless sscanf_u and fixes some infinite loop issue when there are few entities in the server 2018-09-11 03:20:52 +10:00
Lorenc Pekaj
d7e803acc9 bug fixes for paintball module 2018-09-11 03:20:01 +10:00
Lorenc Pekaj
896302c2be use scriptinit for database 2018-09-11 03:19:21 +10:00
Lorenc Pekaj
ef25eb8112 remove "sccanf_u" definition ... caused issues 2018-09-11 03:19:02 +10:00
Lorenc Pekaj
3c58eb8523 beautify biz production command 2018-09-11 01:38:54 +10:00
Steven Howard
e564127a67 added productions into command 2018-09-10 16:27:21 +01:00
Lorenc Pekaj
7f694a22b2 Merge branch 'modulize_houses' of ssh://bitbucket.org/lorenc/cnr into modulize_houses 2018-09-10 18:35:15 +10:00
Lorenc Pekaj
9ab92d9613 modularizes the furniture system 2018-09-10 18:34:30 +10:00
Lorenc Pekaj
60f5ec2ac0 Merged master into modulize_houses 2018-09-10 18:26:31 +10:00
Lorenc Pekaj
51c281878a irresistible guard as component 2018-09-10 18:25:39 +10:00
Lorenc Pekaj
d67e2ae6a0 move vip as feature 2018-09-10 18:25:23 +10:00
Lorenc Pekaj
cdb6f5a76e modulize houses 2018-09-10 18:24:53 +10:00
Lorenc Pekaj
0c77b091ee move all spawn information into spawn.pwn (renamed cities.pwn) 2018-09-10 18:16:29 +10:00
Stev
b83b1ef17f added the option the change headshot mode dialog
added /p [MESSAGE] for paintball lobby chat
2018-09-10 09:00:20 +01:00
Lorenc Pekaj
605f4a28a6 add rcon message helper function 2018-09-10 17:19:38 +10:00
Lorenc Pekaj
90ff5fb71a move paintball file 2018-09-10 17:19:15 +10:00
Stev
fa4aa3786b Merge branch 'master' of https://bitbucket.org/lorenc/cnr into features-paintball 2018-09-10 08:04:13 +01:00
Stev
75e0b063da no message 2018-09-10 00:46:16 +01:00
Stev
e597f9559a modulised paintball and adding headshot mode 2018-09-10 00:37:47 +01:00
Lorenc Pekaj
2f710a8f1a move textdraws into textdraw module ... removed pointless InitializeTextDraws callback 2018-09-10 07:53:46 +10:00
Lorenc Pekaj
219f1aeb13 features thrown into cnr ... gangs has now its own index include 2018-09-10 07:18:09 +10:00
Lorenc Pekaj
d55608bc83 move features folder 2018-09-10 07:09:35 +10:00
Lorenc Pekaj
984f154d93 administration commands placed into modules 2018-09-10 06:55:38 +10:00
Lorenc Pekaj
9d0d864f48 getter and setters moved to global/player 2018-09-10 05:47:14 +10:00
Lorenc Pekaj
ea3ed69bf9 disable house fires if there are no created homes 2018-09-10 02:54:40 +10:00
Lorenc Pekaj
6e9073296f moved gamemode modules into gamemodes/irresistible ... updated git ignore 2018-09-10 02:01:29 +10:00
Lorenc Pekaj
5e938dc4ba crowdfunding darken list items 2018-09-09 23:14:00 +10:00
Lorenc Pekaj
303c7ce698 fix a few bugs with trucking and boxing 2018-09-08 00:20:55 +10:00
Lorenc
5d34049735 fixed ranking bug and goto parameter for admins 2018-08-02 02:30:18 +02:00
Lorenc
5e3f808b82 robberies in highscores 2018-07-13 08:46:07 +10:00
Lorenc Pekaj
d786e8c52f bug fixes 2018-07-13 08:19:22 +10:00
Lorenc Pekaj
555ba962da highscores, removed npc, boosted safe profit 2018-07-12 10:26:53 +10:00
Lorenc Pekaj
af06396a46 gates opened via MMB 2018-07-06 10:02:18 +10:00
Lorenc Pekaj
b68a72fe1c add orbital cannon, supa in facilities, rpg 2018-07-04 03:36:04 +10:00
Lorenc Pekaj
e7d3b3f105 duel arena, discord url, public gangs via /gangs, increase speed of progress bars 2018-06-27 18:12:26 +10:00
Lorenc Pekaj
cf301ac290 auto arrest , auto bc , auto untie , alcatraz revamp , facility weapons 2018-06-23 17:54:55 +10:00
Lorenc Pekaj
246c768e85 new vip system 2018-06-09 14:11:47 +10:00
Lorenc Pekaj
55c633de4d buyable armour and weapon/health drops 2018-05-25 06:29:21 +10:00
Lorenc Pekaj
12bd572765 new tax system 2018-05-21 19:21:39 +10:00
Lorenc Pekaj
26189aca7c radio stations fixed, duplicate maps removed 2018-05-13 21:16:01 +10:00
Lorenc Pekaj
b20467df2d ship hiest, custom spawning, first version of facilities 2018-05-13 02:25:47 +10:00
Lorenc Pekaj
55ddb92efb v11.12.50 2018-04-23 21:48:54 +10:00
Lorenc
94aaa471b2 gang turf improvements
new class selection
blackjack improvements
2018-04-13 14:50:25 +10:00
Lorenc
66e18dd1e9 revamp tax system, tax the shit out of the super rich 2018-04-07 16:30:25 +10:00
Lorenc
16cd362237 * security lvls now add crackpw cooldown and safes always payout 2018-04-04 00:27:54 +10:00
Lorenc
0cb27533b1 crackpw notifications for owner 2018-04-03 11:19:57 +10:00
Lorenc
efc018460e money case reduced + boxing patches 2018-04-02 09:40:18 +10:00
Lorenc
4491fae0fd can rob businesses now 2018-04-02 00:24:07 +10:00
Lorenc
7dcfe85b83 Roadblock and spikestrips improvements 2018-04-01 09:45:22 +10:00
Lorenc
05ac015a11 boxing bug fixes 2018-03-31 01:20:37 +11:00
Lorenc
c2bde742c2 irresistible guard improvements 2018-03-31 00:04:29 +11:00
Lorenc
d1cc4dc315 v11.11.30 2018-03-30 19:46:30 +11:00
Lorenc
019bc83e0f bar system implementation 2018-03-30 19:43:19 +11:00
Lorenc
f7c6463fca add atms into visage
fix new bunker
2018-03-28 10:44:34 +11:00
Lorenc
a7609e8f14 * new bunker
* double robbery
2018-03-28 09:14:09 +11:00
Lorenc
d301c3d982 * number_format improved
* fireworks for players (beta)
* airport travelling
2018-03-26 00:01:26 +11:00
Lorenc
ea4ebdd843 log royal flush 2018-03-24 14:06:20 +11:00
Lorenc
cd2a56b172 adds better random probability + high roller facility 2018-03-24 12:34:01 +11:00
Lorenc
89c187477e * readjust table blinds
* cannot enter a table while in a table
* thrown out if jailed
2018-03-22 06:37:20 +11:00
Lorenc
be72c77ef4 * robbery cash 3x
* jail and jizzy -1.0 streamdist
2018-03-21 07:45:47 +11:00
Lorenc
c56e99943d reconfigure comps with appropriate house edge 2018-03-21 04:47:45 +11:00
Lorenc
1929f83ef2 add casino rewards for gambling 2018-03-20 23:26:32 +11:00
Lorenc
e2e31f3dbb * fix some blackjack backtraces
* hardcode new visage interior
* replace syncobject with streamer_update
2018-03-19 07:43:40 +11:00
Lorenc
a024ab3894 v11.10.20 2018-03-19 01:32:24 +11:00
Lorenc
904ba4ccc2 * implement visage
* modularize casino games and security
2018-03-18 05:51:31 +11:00
Lorenc
271c96341c * modulize mysql, blackjack
* working on apartment for visage
2018-03-17 05:28:58 +11:00
Lorenc
e23cfeb4b2 backup current pre-poker integration 2018-03-15 15:20:47 +11:00
Lorenc
a6d9856f24 modular update 2018-02-13 07:17:51 +11:00
Lorenc
982986fb9b bj 2018-01-30 20:32:02 +11:00
Lorenc
f17da0fb12 retest 2017-12-15 20:04:59 +11:00
Lorenc
4c3f10df58 backup 2017-12-13 03:22:15 +11:00
Lorenc
eafaaea840 bunker 2017-10-23 02:36:23 +11:00
Lorenc
54d66bd431 hunter killing improvements + /help articles improved/sorted 2017-10-09 09:28:03 +11:00
Lorenc
99c32249ec hunter detection 2017-10-08 13:40:03 +11:00
Lorenc
3214ec444a anti cheat add and biz fixes 2017-10-02 05:43:17 +11:00
Lorenc
62bb43213f (+) Business bank account added
(*) Some additional edits to were made
(/) Weed businesses take 10 hours, meth 8 hours and coke 6 hours respectively to resupply
(/) The irresistible coin market (/ic market) has been redesigned
(/) There are limits to how much supplies you can buy for a business
(-) Silver VIP is no longer available, see forum announcements
(-) Removes map tax system completely (all code associated with it)
2017-09-28 02:45:49 +10:00
Lorenc
a67fa3bcaa business system 2017-09-21 21:11:41 +10:00
Lorenc
5c1a0ae5f7 gotta finish at uni 2017-07-28 09:16:43 +10:00
Lorenc
92be775c93 overseas coding 2017-07-23 23:04:03 +10:00
Lorenc
7b831bf011 race system indev 2017-06-23 22:51:18 +10:00
Lorenc
962f9d622c v10.8.32 2017-05-30 00:11:42 +10:00
Lorenc
d6b31f6743 discord for samp included with sockets 2017-05-10 08:53:10 +10:00
Lorenc
fb573066db 10.4.20 2017-04-16 05:49:38 +10:00
Lorenc
e779be24f1 casino 2017-03-11 14:12:51 +11:00
Lorenc
beb89a8587 v10.2.8 2017-03-06 02:24:38 +11:00
Lorenc
2e41b3dc66 v10.0.0 2017-02-14 19:40:16 +11:00
Lorenc
9ad299946a v10-rc4 2017-01-22 04:26:55 +11:00
Lorenc
a82fca4b3d mapping tax
gates 350 ic
vip commands update
2017-01-18 03:24:54 +11:00
Lorenc
5ac8cd56b4 updates 2017-01-16 04:15:34 +11:00
Lorenc
8131a87b93 vacation 2017-01-06 02:15:54 +11:00
Lorenc
da8fba06d7 update cnr and gitignore 2017-01-02 13:25:10 +11:00
Lorenc
80d5cad9b2 fix up xmas update 2016-12-24 05:24:46 +11:00
Lorenc
06d8bf1a82 easter egg. map and stuff 2016-12-24 03:49:09 +11:00
Lorenc
6daf236233 pride initiate 2016-12-24 03:23:22 +11:00