Commit Graph

1396 Commits

Author SHA1 Message Date
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
655197d59a Merged in pilot (pull request #14)
Pilot
2018-09-16 03:41:07 +00: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
9fcae25208 Merged in houses-bugs (pull request #11)
fixed bugs when player enters password into a house and automatically spawns outside the house
2018-09-13 21:37:51 +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
Steven Howard
0f49d7a74b Merged in houses (pull request #9)
changing number_format to cash_format for cash related

Approved-by: Lorenc Pekaj <pekajlorenc@gmail.com>
2018-09-12 07:00:51 +00: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
f7e86b1c09 Merged in pilot-minijob (pull request #7)
adding pilot minijob (cargo delivery from static place to random airport)
2018-09-11 13:45:54 +00:00
Steven Howard
94640d40a4 adding pilot minijob (cargo delivery from static place to random airport) 2018-09-11 14:34:16 +01:00
Steven Howard
b1afca6a7e adding pool system in changelog 2018-09-11 11:46:57 +00:00