JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,497 Commits 1 Branch 0 Tags 481 MiB
735550c157
Commit Graph

9497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keir Nellyer
7db7c0914e Get time since report has been created 2016-06-30 17:23:29 -04:00
xGamingDudex
0393e682c3 Merge clean up 
Every bloody time there are files who don't want to join the rest in the
merge commit.... >.>
 2016-06-30 23:10:28 +02:00
xGamingDudex
6d9e84b817 Merge branch 'develop' of 
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders

Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
 2016-06-30 23:08:31 +02:00
xGamingDudex
03511a7234 Updated values 
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.

Seem to have forgotten to include the MavWorldManager earlier... ups.
 2016-06-30 22:56:26 +02:00
Sam
40124b2cdd Updated changed method name (getThrower) 
In the ProjectileData class GetThrower was changed to getThrower, this
fixes that in any of my classes
 2016-06-30 17:19:53 +01:00
Sam
69bd4006d4 Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint 2016-06-30 17:14:38 +01:00
samczsun
045e1b3064 Fix various Clans bugs 
Viper destroying armor
Legendaries not saving properly
Combat log NPC for vanished players
 2016-06-30 05:20:44 -05:00
Thanos Paravantis
e25a6e4327 Reset leap data when needed (death/quit/game end) 2016-06-30 05:18:39 -05:00
Thanos Paravantis
5c60819179 Prevent NPE on player interact event 2016-06-30 05:18:39 -05:00
Keir Nellyer
c076a46078 Show all involved users correctly 2016-06-29 22:13:13 -04:00
Keir Nellyer
1c73d2a793 Fix age of report not showing when no chat messages 
Use a dummy value for now until I get the system to calculate the age
 of the report.
 2016-06-29 18:16:26 -04:00
Keir Nellyer
a3f4a4c185 Change message for when there are no chat messages for a report 2016-06-29 18:07:26 -04:00
Keir Nellyer
e1a32b6da0 Show error messages for reports which do not have any related chat 
messages
 2016-06-29 18:06:30 -04:00
xGamingDudex
f9208b67ef Added schematic support for ground in MB. 
Also fixed an NPE and moved a constructor to protected.
 2016-06-29 15:19:46 +02:00
xXVevzZXx
880ac6b88f Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes 2016-06-29 06:21:18 +02:00
Keir Nellyer
d2b1a7b0c1 Add todo for handling invalid report number input 2016-06-28 21:50:33 -04:00
xGamingDudex
32ee27d9ee Small bugfixes with QA 
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
 2016-06-29 03:49:53 +02:00
xGamingDudex
9d8eb1f044 ArcadeManager doing .zip check, but not acting upon it 2016-06-29 03:46:58 +02:00
LCastr0
671dcaf3aa Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics 2016-06-28 18:14:05 -03:00
LCastr0
324a967135 Merge pull request #118 from Mineplex-LLC/develop 
Merge develop into project-cosmetics
 2016-06-28 18:13:09 -03:00
LCastr0
24186d9992 More fixes for gadget persistence 2016-06-28 18:11:00 -03:00
Thanos Paravantis
04cb0fb0b0 Use updated ProjectileUser method names 2016-06-28 23:09:52 +03:00
Thanos Paravantis
4436ba0710 Merge branch 'develop' into thanos-mineware 2016-06-28 23:05:11 +03:00
Thanos Paravantis
c5c08562c3 Merge branch 'master' into thanos-mineware 2016-06-28 23:01:42 +03:00
Thanos Paravantis
42ebb95db1 Fix NPE on zombie infection 2016-06-28 21:57:32 +03:00
Thanos Paravantis
973666a42f Improve challenge selection system 
- Game will no longer end unexpectedly, when all challenges are played.
- Challenges are now marked correctly as played.
 2016-06-28 21:57:17 +03:00
Thanos Paravantis
5e9f16424c Add shouldDie method, update zombie wrapper name 2016-06-28 20:38:32 +03:00
Thanos Paravantis
43f375fd86 Reset team data on team challenges 2016-06-28 20:37:26 +03:00
Thanos Paravantis
eea980b354 Apply smoother knockback on volley pig 2016-06-28 18:41:50 +03:00
Thanos Paravantis
c5367d4510 Remove double plants entire from spawn locations 2016-06-28 12:15:49 +03:00
Thanos Paravantis
cf434b92de Modify punch the pig description 2016-06-28 11:47:47 +03:00
Thanos Paravantis
dc250d4bf2 Store locations after game start (fix NPE) 2016-06-28 11:47:25 +03:00
Thanos Paravantis
7218dc710f Retrieve scoreboard data only when possible 2016-06-28 11:46:38 +03:00
xGamingDudex
8ad63ef7ea Tweaked some code to better fitt schematics. 2016-06-28 06:29:44 +02:00
xGamingDudex
cd5555c3f9 Fixed invis entities after pasting blocks + removed debug code 2016-06-28 04:03:40 +02:00
Keir Nellyer
561734e7fe Remove unused imports (accidentally added) 2016-06-27 21:18:40 -04:00
AlexTheCoder
beeddfedd4 Force the ball to drop if the carrier is AFK 2016-06-27 21:07:44 -04:00
xGamingDudex
a69101bef3 Cleaned out some debug messages and added some java-docs. 2016-06-28 01:35:37 +02:00
xGamingDudex
65e05b9d8c Small polish on Mavericks Master Builders 2016-06-28 01:13:34 +02:00
AlexTheCoder
5b32eb4815 Update to Kit Progression system 2016-06-27 18:47:15 -04:00
AlexTheCoder
119931ac71 Remove unneeded Data Loc 2016-06-27 18:33:01 -04:00
AlexTheCoder
ab315627ad Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game 2016-06-27 17:45:36 -04:00
Keir Nellyer
128f6af83d Show time of last report and time since 2016-06-27 18:15:41 +01:00
Keir Nellyer
48a2d0d304 Remove old completed todo 2016-06-27 18:06:01 +01:00
Keir Nellyer
42bd2148e5 Don't allow a user to handle more than one report simultaneously 2016-06-27 17:56:01 +01:00
xGamingDudex
d6672c44f4 Finalized the hub module and finished local testing 
Cleaned up some source. Applied some small updates. Finished local
testing.
 2016-06-27 00:34:17 +02:00
xGamingDudex
966eaf1616 Fixed some entity tracking bugs regarding chunk update packets 2016-06-27 00:16:04 +02:00
Keir Nellyer
dbf0bf35b4 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 23:00:19 +01:00
Keir Nellyer
90df695624 Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-06-26 00:18:07 +01:00
xXVevzZXx
c966620808 Change resourcepack links 2016-06-25 19:52:22 +02:00