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

6623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
libraryaddict
627ce08113 Add info on note particle 2015-11-07 21:35:26 +13:00
Shaun Bennett
e1f56a5d5a Merge remote-tracking branch 'origin/master' 2015-11-07 01:10:34 -05:00
Shaun Bennett
ec7600a4a2 Giveaway tweaks 2015-11-07 01:10:27 -05:00
Cheese
c922c3248c disabled trick or treat 2015-11-07 13:36:16 +11:00
Cheese
f4bf685e96 removed halloween hub 
removed titan giveaway and pumpkins
 2015-11-07 13:20:29 +11:00
Shaun Bennett
4add7449eb Merge remote-tracking branch 'origin/master' 2015-11-06 21:15:45 -05:00
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -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
Keir
783bec75db Fix for some preferences not applying correctly. 2015-11-06 23:04:51 +00:00
Keir
fd2a543418 Add "ShowUserReports" preference (however currently not visible to players nor does it get saved to the DB currently). 
Fix variable names in ReportManager.
 2015-11-06 16:46:10 +00:00
libraryaddict
d3d448ccfe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 2015-11-07 04:47:37 +13:00
libraryaddict
cc0f12f6c8 Fix player interactions packets not working properly on armorstand and when clicking block behind entity 2015-11-07 04:45:02 +13:00
NewGarbo
b835823230 Preferences page changes to free up space, as the current preferences layout is completely full. 
Removed unnecessary Spawn variable in Clans.java, as it was causing a warning and warnings look ugly.
 2015-11-06 13:19:02 +00:00
NewGarbo
7675b00999 Dominance event. Shaun will have to call the new events once he's done with Dominance. 2015-11-06 07:11:06 +00:00
Keir
0c0b3708c6 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report 2015-11-06 01:34:13 +00:00
Keir
e449e47b9a Document ReportNotification. 2015-11-06 01:33:46 +00:00
Sarah
56966d690f Fixing random Creepers, adding giant is under Attack message, adding start message, small fixes 2015-11-05 22:56:07 +01:00
AlexTheCoder
87d7ff8a8f - Synced up expire times for proximity weapons 2015-11-05 02:21:36 -05:00
AlexTheCoder
61653347c7 - Fixed proximity weapons not being able to detonate 2015-11-05 02:11:20 -05:00
AlexTheCoder
9c49ab0408 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf 2015-11-05 01:23:40 -05:00
NewGarbo
1375623625 Added alpha messages. 2015-11-04 17:03:52 +00:00
libraryaddict
77125b3a24 Don't re-set scoreboard lines 2015-11-05 01:10:08 +13:00
libraryaddict
31b4fbec15 Fix a null 2015-11-05 00:49:26 +13:00
libraryaddict
0352e52a68 Tentative beginnings of wider scoreboards 2015-11-05 00:42:45 +13:00
NewGarbo
3ff044fddb Added PlayerUnClaimTerritoryEvent, and added some new stuff to TutorialClanTips 2015-11-04 11:32:06 +00:00
libraryaddict
a0676b7bcf Fix tnt in SG being usable during DM invul 2015-11-04 21:44:10 +13:00
Sarah
ee7006a3de Giant makes Sounds, lifted up Giant, randomize Minions by time played, changing spawn Items. 2015-11-04 07:17:15 +01:00
libraryaddict
21d10e4bec Fix typo 2015-11-04 19:15:06 +13:00
libraryaddict
b3f86ba638 Fixing bugs 2015-11-04 18:34:22 +13:00
NewGarbo
8033b40011 made math in GearPage a tiny bit more understandable 2015-11-04 01:27:33 +00:00
NewGarbo
ed1e394a84 removed an unused type and a bit more cleanup; getting ready to clean up GearPage, which is... *shudders* 2015-11-04 00:09:46 +00:00
NewGarbo
a455804dce some Tutorial code cleanup 2015-11-04 00:07:32 +00:00
NewGarbo
4bf92ce0a0 gah why isn't this working?! git is annoying!!! 2015-11-03 23:47:35 +00:00
NewGarbo
ecd3b0ef76 removed a multiple Mineplex.Core.Common import thingy in the core project or something. i dunno, it was causing errors so i fixed it, yay! 2015-11-03 22:06:23 +00:00
NewGarbo
b7bf4765c4 DANG YOU WILLIAM 2015-11-03 22:05:17 +00:00
NewGarbo
7f03ca0936 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/StaticLazer.java
 2015-11-03 21:19:17 +00:00
NewGarbo
78ab895a14 Added heart particles to the GiantsBroadsword healing feature, also added some strong sounds. 
Made it so that players using the broadsword's effects cannot attack anything.

Added small smoke particle to UtilParticle.

Added a burnout feature to the WindBlade, disallowing players to speed around on the ground for ever.

Moved the Lapis Lazuli block particles from infront of the player, to the feet of the player when using the AlligatorsTooth, as per SamitoD's request.

Removed some debug messages thrown around the code.
 2015-11-03 19:49:14 +00:00
Keir
72b650086d Instantiating a page shouldn't cause it to automatically open. 2015-11-03 17:03:09 +00:00
Keir
bd6ce21cf7 Make use of foreign keys in table creation and drop "INDEX" statements (foreign keys are auto-indexed). 2015-11-03 16:40:31 +00:00
Keir
6054bfaac4 Do all database operations asynchronously. 2015-11-03 15:37:39 +00:00
Keir
9030b4f264 Remove unused column 'date'. 2015-11-03 15:27:32 +00:00
libraryaddict
c25b1969de More progress 2015-11-04 04:00:53 +13:00
libraryaddict
f66c85d5b0 When clearing or getting items from player inventory, get it from player crafting as well 2015-11-03 18:57:41 +13:00
libraryaddict
93ff7c32b5 Merge pull request #71 in MIN/mineplex from alex-bugfixes to master 
* commit 'c518221f6b6d11da83b686445f54d702c35a3d3e':
  - Fix Merge Error
  - Fixed MPS Whitelist
  - Resolved randomly using java 8 in this one plugin
  - Fixed MPS Whitelist for usernames with non-lowercase characters
 2015-11-02 23:22:21 -06:00
AlexTheCoder
c518221f6b - Fix Merge Error 2015-11-02 22:14:48 -05:00
AlexTheCoder
c41d01e213 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-bugfixes 
Conflicts:
	Plugins/Mineplex.StaffServer/.classpath
 2015-11-02 22:09:18 -05:00
AlexTheCoder
89c9f19c69 - Fixed MPS Whitelist 2015-11-02 22:08:02 -05:00
libraryaddict
975ad9e6ea Update to master 2015-11-03 15:05:56 +13:00
libraryaddict
3de906ab19 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/CustomDamageEvent.java
	Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/damage/DamageManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snowfight/SnowFight.java
 2015-11-03 14:57:25 +13:00
libraryaddict
7496ed763a Fix wither and dead bodies bug 2015-11-03 14:41:34 +13:00