JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,102 Commits 1 Branch 0 Tags 481 MiB
528a7435e7
Commit Graph

334 Commits

Author SHA1 Message Date
NewGarbo
52c4a55180 outpost changes, and some other things 2016-01-06 22:32:36 +00:00
NewGarbo
369687b5dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 
Conflicts:
	Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
 2015-12-23 18:31:51 +00:00
NewGarbo
7ac1fd86b4 made pvp timer players immune to skills 2015-12-15 21:12:49 +00:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
fooify
348f2d8e4c Merge remote-tracking branch 'origin/master' into foo 2015-12-03 16:31:16 -08:00
NewGarbo
f536bf23e5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-01 12:06:25 +00:00
NewGarbo
d32e6fdb96 Got rid of deployed tasks. using different system now. (untested) 2015-12-01 11:28:14 +00:00
Jonathan Williams
03a1f19df9 Fixed memory leaks in Disguise and Recall. 
Removed debug messages in ItemMapManager
 2015-11-30 23:49:16 -06:00
Jonathan Williams
513810caaa Fixed memory leak in MarkedForDeath 2015-11-30 14:26:25 -06:00
fooify
61df87b446 Merge remote-tracking branch 'origin/master' into foo 2015-11-29 06:37:30 -08:00
Shaun Bennett
f82396d485 Clans changes/fixes 2015-11-29 02:41:53 -05:00
NewGarbo
e1be0b1dbd dupe fix 2015-11-28 23:34:41 +00:00
fooify
8cdae7ce1a Merge remote-tracking branch 'origin/master' into foo 2015-11-28 09:33:47 -08:00
NewGarbo
a0ae500876 tutorial revamp [clans] 2015-11-28 09:03:58 +00:00
Shaun Bennett
6da10950da Update clan icons, fix client class 2015-11-26 22:37:54 -05:00
NewGarbo
bb3ea0115d fixed classes not loading 2015-11-26 20:41:42 +00:00
NewGarbo
11deec75dd fixed illusion 2015-11-26 00:44:13 +00:00
Shaun Bennett
cc75bafb4c Bugs and thugs 2015-11-25 16:45:04 -05:00
Shaun Bennett
ff5d828dd7 Merge with master, lots of clans fixes/work 2015-11-25 14:50:49 -05: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
7454cf7443 MS + Champs bugs, balance and more 2015-11-24 15:23:37 +11:00
fooify
f8401e0eeb fixed shield smash and fissure affecting spectators 2015-11-23 17:08:24 -08:00
fooify
f300fd2c98 Merge remote-tracking branch 'origin/master' into foo 2015-11-23 15:34:27 -08:00
Jonathan Williams
875b87e0e4 Fixed memory leak crashing servers. 2015-11-23 02:41:38 -06:00
fooify
205643028e fixed slab issue with Assassin's Flash 2015-11-21 11:00:51 -08:00
Cheese
4a0cc79abf fixed silence not working in non-champs servers 2015-11-21 11:08:09 +11: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
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
libraryaddict
208d90c4bc Fixed getTargetBlock being 0 when its infinite 2015-11-17 10:18:42 +13:00
Cheese
60a6a81587 faster cleanup 2015-11-14 13:03:41 +11:00
Cheese
9518b64e3c clean up snowballs 2015-11-14 12:55:43 +11:00
Cheese
259397b6ae READY 2 GO 2015-11-14 12:52:14 +11:00
Cheese
770e2be44b Merge branch 'master' into alex-ctf 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-11-14 11:07:44 +11:00
Cheese
5586132429 champions balance 2015-11-14 11:05:51 +11:00
AlexTheCoder
016e54977d - Finish game [FINALLY] 2015-11-12 21:16:58 -05:00
Shaun Bennett
0b41450603 Revert "Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta"" 
This reverts commit 6c17b2926c.
 2015-11-12 17:51:13 -05:00
Shaun Bennett
6c17b2926c Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta" 
This reverts commit ce1c09b88f, reversing
changes made to 1aef7fe0b9.
 2015-11-12 16:35:31 -05: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
NewGarbo
ce1c09b88f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/.idea/compiler.xml
	Plugins/Classpath.Dummy/src/net/minecraft/server/v1_7_R4/PacketPlayOutPlayerInfo.java
	Plugins/Libraries/craftbukkit.jar
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java
	Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
	Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketVerifier.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/page/ShopPageBase.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Assassin/Illusion.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/item/ItemFactory.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
 2015-11-11 19:35:44 +00:00
libraryaddict
37fdf53a51 Fixed champion's Illusion crash 2015-11-11 00:21:28 +13:00
AlexTheCoder
d654f1f4b1 - Fixed class edit in lobbies 
- Fixed conflict between rave suit and assassin
 2015-11-10 06:17:25 -05:00
AlexTheCoder
fafc92606c Merge branch 'MC_1.8' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
 2015-11-06 18:43:11 -05:00
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00