Mysticate
f7011032bc
Switching branches
2015-11-19 19:49:46 -05:00
Keir
bceb69bc12
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2015-11-19 23:52:02 +00:00
Mysticate
f02e2b2e72
Formatting
2015-11-19 18:02:07 -05:00
Mysticate
e816a79f37
Reformatted
2015-11-19 17:51:25 -05:00
Mysticate
502f12f00f
Fixed paintball to the max. :>>
2015-11-19 17:46:07 -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
Sarah
0fedb99660
Changing the tutorial visuals and texts.
2015-11-19 21:04:50 +01:00
Shaun Bennett
c29fd242ca
Forgot to remove the unnecessary check
2015-11-19 14:46:01 -05:00
Sarah
ad280c96c9
adding interactive Chat elements.
2015-11-19 20:45:40 +01:00
Shaun Bennett
f47a61e38e
Use bounds for energy tracker messages aren't displayed multiple times
2015-11-19 14:44:03 -05:00
Shaun Bennett
63e580404c
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClanEnergyTracker.java
2015-11-19 14:36:08 -05:00
Shaun Bennett
3820035762
Cleaning up duplicate code/small optimizations (untested)
2015-11-19 14:35:59 -05:00
NewGarbo
b0c60fd1f4
sparkly rare items! woo. and fixed gold dropping waaayyy too much
2015-11-19 19:03:51 +00:00
NewGarbo
7d8e1b517d
Fixed dropped gold stacking...
2015-11-19 08:56:07 +00:00
NewGarbo
f262a22913
Fixed loot dropping in King of the Hill not dropping correct items/
2015-11-19 08:54:59 +00:00
NewGarbo
6372dfd629
fixed ArithmeticException / 0 in ClansEnergyTracker.
2015-11-19 08:29:50 +00:00
Virizion
975b1df477
Added the title message when a perfect match. Turns out having a '%' in the text caused it not to appear.
2015-11-18 22:03:04 -05:00
fooify
6d0879a175
Re-fixed Barbarian bug
2015-11-18 17:31:28 -08:00
Virizion
796f116cfd
Merge branch 'master' into virizion_speed_builder
2015-11-18 19:27:42 -05:00
Virizion
937d024ea5
Empty builds are auto eliminated. Damage player 9001 so the elimination is handled by the managers and not us. If there are not enough build areas for the players, the game ends. Shows a message that you completed the build if you complete it correctly. It also plays a sound. It would have a title but the title wasn't showing up for some reason...
2015-11-18 19:26:19 -05:00
NewGarbo
0a667afeb1
finally fixed beds. major cleanup of code, much more organized now, thank you, Me!!!! oh my god both of my eyes are twitching
2015-11-18 22:27:01 +00:00
Sarah
d7d11e57e5
Merge pull request #76 in MIN/mineplex from william-global to master
...
* commit '4620a5a1626aaefb992ff62a14dc35ed9ae60a86':
Hub fix
testing excludes
2015-11-18 15:49:18 -06:00
William Burns
4620a5a162
Hub fix
2015-11-18 21:47:52 +00:00
Sarah
a8ba1f1ea6
some perspektive changes to the tutorial and removing prepare timer.
2015-11-18 22:33:47 +01:00
Virizion
76db2710ae
It should have been all got the build 100% correct not all got the same score.
2015-11-18 16:10:44 -05:00
NewGarbo
eded09b1a9
fixed yet another bug with beds... argh it seems to be working fine now.
2015-11-18 21:02:39 +00:00
Keir
cb5672b94c
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-11-18 20:34:24 +00:00
NewGarbo
6f3693f804
more bug fixes
2015-11-18 19:32:20 +00:00
NewGarbo
924504ac9f
fixed clans home NPE. also added GRASS to UtilItem's item property system.
2015-11-18 19:03:44 +00:00
William Burns
6fa2a58f5d
Merge branches 'master' and 'william-global' of ssh://184.154.0.242:25565/min/mineplex into william-global
2015-11-18 18:50:09 +00:00
William Burns
0e1c72e25d
testing excludes
2015-11-18 18:46:51 +00:00
Sarah
f2830e653e
Making last changes to the tutorial
2015-11-18 19:25:12 +01:00
NewGarbo
16eecdd112
fixed clan energy alerts going off incorrectly
2015-11-18 17:30:45 +00:00
Sarah
bff9a065d9
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java
2015-11-18 18:08:51 +01:00
Sarah
64970ab8d6
adding little tutorial at the start of the game.
2015-11-18 17:53:35 +01:00
NewGarbo
5c2569e822
revert certain permissions from being ALL or containing JR.DEV (that were used for testing)
2015-11-18 16:20:27 +00: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
a11ca138e7
ranks
2015-11-18 16:01:53 +00:00
William Burns
04a4b072af
woops easy fix
2015-11-18 15:48:25 +00:00
William Burns
2e223d0660
rawr and fixes
2015-11-18 15:42:33 +00:00
William Burns
e16ee9036a
Added the ability to give out game loot.
2015-11-18 14:35:40 +00:00
William Burns
e83b49d490
Reformatting titles
2015-11-18 13:43:22 +00:00
NewGarbo
5c383a1df3
cleaned up /sethome old bed removal, as previous way would delete any beds around the home bed, which would destroy
2015-11-18 12:24:28 +00:00
NewGarbo
9eaffc8acf
Added methods into UtilBlock to place beds and doors. updated /sethome to use the new method for placing beds. i'm sure they'll come in handy later on.
2015-11-18 12:17:00 +00:00
NewGarbo
cd0ce57691
replaced useless looping with just checking the rotation of the bed.
2015-11-18 09:58:06 +00:00
NewGarbo
1ea87b8354
Fixed an NPE when destroying a Clan's Home
2015-11-18 09:37:32 +00:00
NewGarbo
03764ad480
removed the disallowing of interaction in ClansGame.java if the block that the player is hitting, is a Clan's Home. This was messing up the other code for Clan Home bed stuff.
2015-11-18 08:40:24 +00:00
NewGarbo
f5e12e5014
formatted ClansGame.java (separate commit because confusion otherwise)
2015-11-18 08:37:34 +00:00
NewGarbo
77f234e5f5
Made energy warnings stay for longer
2015-11-18 08:32:48 +00:00
