Commit Graph

4727 Commits

Author SHA1 Message Date
libraryaddict 5f8f643d95 What snake mount code I did 2015-11-28 05:26:43 +13:00
libraryaddict 3c98243201 Some more guardian stuff 2015-11-27 15:56:56 +13:00
libraryaddict 0a4416381b Fix guardian 2015-11-27 15:55:02 +13:00
Cheese 98d988584d titan cosmetics 2015-11-27 13:35:25 +11:00
Cheese 193c5fe487 fixed static 2015-11-26 15:26:57 +11:00
Cheese 059a9a32cd fixed method 2015-11-26 14:51:45 +11:00
Cheese 83a7b398bc Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-26 14:47:24 +11:00
Cheese 1a5dbc073d recursive block find method 2015-11-26 14:47:01 +11:00
libraryaddict 55ff04ca93 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-26 15:49:54 +13:00
libraryaddict 3e8a53562e Add new hologram interaction thingy so holograms can catch interactions that they would normally block 2015-11-26 15:49:28 +13:00
Cheese 55f5f95869 added no ammo display 2015-11-26 13:05:27 +11:00
Cheese 65a1441e1f -Fixed smoke being removed when bomb was planted in it
-Fixed being unable to defuse bomb in smoke
-Fixed older smokes removing newer intersecting smokes
-Grenades will still detonate after being burned
-Bizon now gives $600 per kill
-Added replacement smoke on gun fire
-Added shell ejecting particles on gun fire
-Removed gun bobbing when firing
-Changed ammo display location
2015-11-26 12:56:26 +11:00
Cheese f668ae6082 ms smoke 2015-11-25 17:49:18 +11:00
Cheese 360f3db2ed fixed grenade vertical rebound bug 2015-11-25 17:48:32 +11:00
Cheese 8ceb6ccfca minestrike update! 2015-11-25 17:41:00 +11:00
Cheese d66bad572f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 22:19:59 +11:00
libraryaddict 5799edae50 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-11-24 23:45:42 +13:00
libraryaddict ddf7528796 Updated CB 2015-11-24 23:45:22 +13:00
Cheese 837be048a6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:38:47 +11:00
Jonathan Williams f8d8b75586 Changed how timings is used. 2015-11-24 04:36:18 -06:00
Cheese 7e2f5f0657 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 21:30:45 +11:00
Cheese 11a60a86a9 Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-24 21:30:17 +11:00
Jonathan Williams fbea0e702b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 02:56:40 -06:00
Cheese c5b5d07627 evade timing 2015-11-24 16:07:11 +11:00
Cheese 913d079623 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-24 15:23:53 +11:00
Cheese 7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
libraryaddict c48c743ebf Merge pull request #79 in MIN/mineplex from WitherAssault-Fix to master
* commit '19803a00ab50658b33b79ac4f2909932c9e4161b':
  Added the Wither Assault fixes to it's own Branch
2015-11-23 10:11:30 -06:00
Jonathan Williams 875b87e0e4 Fixed memory leak crashing servers. 2015-11-23 02:41:38 -06:00
Morten 19803a00ab Added the Wither Assault fixes to it's own Branch 2015-11-22 19:06:24 +01:00
libraryaddict cfeafff2f6 EntityDismountEvent stuff 2015-11-22 14:44:32 +13:00
AlexTheCoder 3bb11bba08 - Fixed Stats [caused by bad communication between chiss and I] 2015-11-21 11:30:53 -05:00
Cheese 91e40d0e61 hide testing server MOTD 2015-11-21 13:37:19 +11:00
Cheese 9ef99cee20 fixed merge issues 2015-11-21 11:21:54 +11:00
Cheese 6eb1bef1c6 Merge branch 'master' into minestrike-update
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-11-21 11:09:28 +11:00
Cheese 87a30513de Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-21 11:08:23 +11:00
Cheese 4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11:00
AlexTheCoder 8b480cc32b Merge branch 'alex-ctf' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 18:40:42 -05:00
AlexTheCoder 1274dc860d - Stuff for chiss 2015-11-20 18:40:20 -05:00
Cheese 2f91ca5a8a fixed errors 2015-11-21 10:35:17 +11:00
Cheese 4a70e4da90 more fixies 2015-11-21 10:34:08 +11:00
Cheese 4d128d9c7a fixed some skills and wierd hitbox error 2015-11-21 10:29:48 +11:00
Cheese c7297a7a38 fixed invalid proxies exploding 2015-11-21 09:45:01 +11:00
Cheese d5076b1c47 CTF fix 2015-11-21 09:41:02 +11:00
Cheese e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +11:00
Cheese 04be896ff6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-21 09:39:50 +11:00
Cheese 0bc64fec16 Proxy limit fixes 2015-11-21 09:28:15 +11:00
AlexTheCoder 386032a4f5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-20 06:03:30 -05:00
AlexTheCoder f51358552a -B 2015-11-20 05:57:29 -05:00
Jonathan Williams 700e4c9a1f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-19 22:12:08 -06:00
Jonathan Williams 411d6fdb22 Made PlayerTracker use existing code for determining region. 2015-11-19 22:11:45 -06:00