JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,869 Commits 1 Branch 0 Tags 481 MiB
7f75a7ff50
Commit Graph

365 Commits

Author SHA1 Message Date
Shaun Bennett
d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett
e380354bad Refactor CurrencyType 2016-05-29 16:34:21 -05:00
Sam Sun
59c26bdcd7 Undo leap change 2016-05-27 13:41:49 -04:00
samczsun
daf1d1a9ba Fix duplication glitch using fissure 2016-05-26 14:29:12 -05:00
samczsun
9af2c7e9f4
Restore hunger after Hold. Fixes PC-334 2016-05-24 15:38:18 -04:00
samczsun
516ad5a640 Check cancellation before continuing Takedown. Fixes PC-277 2016-05-24 13:15:29 -04:00
samczsun
14c60ec3ba Delay recall by one tick. Fixes PC-328 2016-05-24 13:15:29 -04:00
samczsun
51c9301799 Consider leap level. Fixes PC-330 2016-05-24 13:15:29 -04:00
samczsun
1fc4239b89 Determine whether Ice Prison target is valid. Fixes PC-281 2016-05-16 15:44:22 -05:00
phobia
29b3f03abf Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta 2016-04-14 21:38:48 +10:00
phobia
cbc6689782 Disable /kill in tutorial and reset food level after hold position 2016-04-14 21:38:37 +10:00
Ben
a26403f006 Fix Recall & Smokebomb not working regularly 2016-04-13 13:04:43 +01:00
Ben
159a5403ac Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug) 2016-04-10 16:47:46 +01:00
Ben
fe89a5b68e Fix the Recall rare item duplication bug 2016-04-10 14:50:00 +01:00
Ben
d75d63a81a some missing files and blacklist barrier block from block toss 2016-04-06 18:26:56 +01:00
Ben
bdfb55d4e1 nevermind [revert leap change] 2016-03-11 21:22:01 +00:00
Ben
bfdb7add2e run siege weapon queries async 2016-03-11 21:04:22 +00:00
Shaun Bennett
876a568bd0 Merge remote-tracking branch 'origin/clans/beta' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
 2016-03-08 12:17:07 -06:00
Shaun Bennett
ffd9d98d2e Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
 2016-03-08 12:15:47 -06:00
NewGarbo
ae42aaaab1 Sammy changes + cleanup 2016-03-07 03:25:22 +00:00
NewGarbo
7e2086df1c flash fix, rares update, and outpost fixes 2016-03-06 19:55:58 +00:00
NewGarbo
67c355bf65 remove more eclipse files 2016-02-19 07:22:54 +00:00
NewGarbo
d5583b93f2 remove eclipse files 2016-02-19 07:14:13 +00:00
NewGarbo
002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
Shaun Bennett
50fc1f5a10 merge with develop 2016-01-29 03:44:04 -05:00
Shaun Bennett
d30fb8d8ef Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha 
# Conflicts:
#	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2016-01-29 03:40:28 -05:00
NewGarbo
1f7e1fb6cf fix dupe bug and safelog 2016-01-23 13:40:49 +00:00
md_5
bb4091c7a6 Use Maven for Compilation 2016-01-20 11:20:58 +11:00
Shaun Bennett
9884742552 Fix OrderedObjectives, Starting CombatTutorial work 2016-01-19 16:34:51 -05:00
Shaun Bennett
6c055c31a0 Fix flashing through doors, Update to 0.18c 2016-01-10 20:39:56 -05:00
NewGarbo
04c7f2c1f1 made pressure plates, buttons, and levers from working with block toss 2016-01-10 22:20:50 +00:00
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