JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,719 Commits 1 Branch 0 Tags 481 MiB
55ff04ca93
Commit Graph

2288 Commits

Author SHA1 Message Date
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
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
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
Morten
19803a00ab Added the Wither Assault fixes to it's own Branch 2015-11-22 19:06:24 +01: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
e0885feea6 Merge branch 'master' into alex-ctf 2015-11-21 09:40:07 +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
Cheese
e14f5a36bd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-20 08:34:19 +11:00
Cheese
f33eedf36d text fix 2015-11-20 08:33:51 +11:00
Shaun Bennett
1eff698a34 Merge pull request #75 in MIN/mineplex from william-global to master 
* commit 'a11ca138e764417c23a0060dd134ef7c49741295':
  ranks
  woops easy fix
  rawr and fixes
  Added the ability to give out game loot.
  Reformatting titles
  Added GlobalGiveCoins. Changes Gems a little and the manager.
  More global stuff! Added GlobalGiveGems.
  Global Packet work. Added giveitem sub-command.
 2015-11-18 10:15:33 -06:00
William Burns
e16ee9036a Added the ability to give out game loot. 2015-11-18 14:35:40 +00:00
William Burns
a28adc9673 More global stuff! Added GlobalGiveGems. 2015-11-17 18:26:19 +00:00
William Burns
0f7c52391f Global Packet work. Added giveitem sub-command. 2015-11-17 08:19:36 +00:00
Cheese
adfc2f19eb Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-17 09:20:15 +11:00
Cheese
46505a8e8e converted to new res pack locations 2015-11-17 09:19:33 +11:00
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
AlexTheCoder
016e54977d - Finish game [FINALLY] 2015-11-12 21:16:58 -05:00
Cheese
9de3981dec ms update 2015-11-13 11:24:11 +11:00
AlexTheCoder
bc1b185f0e Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-12 02:44:54 -05:00
AlexTheCoder
a8b27e66d1 - Finalized game to chiss and sigils' requirements minus flag status in scoreboard, will add next commit 
- Fixed items ever being lost from treasurechests
 2015-11-12 00:06:21 -05:00
Cheese
3ed680e1c2 ms update 2015-11-11 15:55:48 +11:00
Cheese
d971e3c8a3 ms update 2015-11-11 12:46:58 +11:00
Cheese
520eb55b88 Merge branch 'master' into minestrike-update 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
 2015-11-11 07:43:50 +11:00
Cheese
b3125e40ff Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-11 07:43:01 +11:00
AlexTheCoder
d654f1f4b1 - Fixed class edit in lobbies 
- Fixed conflict between rave suit and assassin
 2015-11-10 06:17:25 -05:00
libraryaddict
1a2c163ce2 Fix scoreboard out of bounds error 2015-11-11 00:03:08 +13:00
AlexTheCoder
e165cad50f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-10 04:53:32 -05:00
Cheese
0a9c97c32a Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 18:05:01 +11:00
Shaun Bennett
2707173a8b Merge with 1.8 Branch 2015-11-10 01:48:33 -05:00
Cheese
83248a8fec Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-11-10 09:11:27 +11:00
Cheese
0ae5330634 squid changes 2015-11-10 09:11:10 +11:00
Jonathan Williams
ba7d5bbcdc Fixed Arcade! 2015-11-09 03:24:20 -06:00
AlexTheCoder
9e24a5005f - Completed CTF 2015-11-08 03:04:17 -05:00