555908a3c1
Rename preferences gui, add shop items for gold and emeralds (commented out right now), fix typo
2015-08-15 02:03:46 -05:00
27da9b64b6
Merge branch 'KitPreferences' of http://184.154.0.242:7990/scm/min/mineplex into SarahsAwesomeBugFixes
2015-08-15 07:40:40 +02:00
96dc86a481
Fixing map rotation.
2015-08-15 07:34:04 +02:00
2659dd4e39
Fixed minor bugs. Head now follows mob altitude.
2015-08-14 23:17:56 -04:00
fda052ea90
Add treasure chest stats
2015-08-14 21:34:37 -05:00
e89961380b
Merge remote-tracking branch 'origin/master'
2015-08-14 21:14:41 -05:00
1eaa6446af
Fix double hologram and hopefully NPE
2015-08-14 21:14:34 -05:00
c520bd7921
Add recharge to carl spins so that they don't get triggered twice
2015-08-14 20:43:58 -05:00
ac18dd3b79
Fixed iron golem select message. Removed slot change message.
2015-08-14 20:22:00 -04:00
7fb85f24d1
UtilEnt: Change CreatureLook to support LivingEntity, not just Creature
2015-08-14 19:15:35 +12:00
33a6e4cb13
UtilEnt: Add CreatureLook method
2015-08-14 19:12:05 +12:00
a2d7aa77fe
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-08-14 00:37:55 -05:00
f5d934fe53
Fixed sync db calls for pets.
...
Make sure to add/remove pets in mysql.
2015-08-14 00:37:43 -05:00
80588a308b
balanaced brawler
2015-08-13 21:03:48 +02:00
7157aaee2b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 20:56:20 +02:00
a1ba2cffac
fixed needler not doing posion
2015-08-13 20:56:02 +02:00
0b4dbab871
Change ticket command access to admin
2015-08-13 11:23:29 -05:00
bd7317cf7b
Fix ticket command rollback >:D
2015-08-13 11:03:12 -05:00
eaad787075
Removed the base kit and replaced it with Iron Golem.
2015-08-13 08:16:33 -04:00
5fa9135b08
renamed soccer to slimeball :)
2015-08-13 14:11:22 +02:00
6ef3215516
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 13:25:41 +02:00
534c91c706
remove items from inside soccer
2015-08-13 13:24:55 +02:00
bc8aff31cb
Merge remote-tracking branch 'origin/master'
2015-08-13 06:12:24 -05:00
af15476f19
Use login query to handle logins
2015-08-13 06:12:11 -05:00
878ac82ade
fixed error!
2015-08-13 13:01:41 +02:00
1487692609
completely disabled team armor in arcade. avoids typing it just as game starts.
2015-08-13 12:57:30 +02:00
fc1a8e4e25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-13 12:52:11 +02:00
f3b58fe9b6
disabled team armor command in games D:
2015-08-13 12:51:57 +02:00
e1d04354fb
Use dummy record for AddPlayer
2015-08-13 05:18:53 -05:00
94c00cdb72
Adding some comments
2015-08-13 04:05:28 -05:00
4d6e827739
Remove vote3!
2015-08-13 04:03:03 -05:00
92c0e1452b
Add vote3
2015-08-13 04:01:53 -05:00
0c68321e81
Global button
2015-08-13 03:58:05 -05:00
11a4805c38
Stat stuff!
2015-08-13 03:54:23 -05:00
4aac057956
Merge remote-tracking branch 'origin/master'
2015-08-13 03:32:40 -05:00
05b1b91686
Carl!
2015-08-13 03:32:31 -05:00
8476578bc0
Merge pull request #28 in MIN/mineplex from Myst_LOBBERS to master
...
* commit 'f8a6a25b46b9336ae8a727e1f3478f3a7a394324':
Various Fixes.
2015-08-13 01:52:16 -05:00
a308244966
Merge pull request #29 in MIN/mineplex from foo to master
...
* commit '07bdbdde46e2a9e7b49f4e8606c9068a0534c18d': (22 commits)
minor grammar issue
remove duplicate method
manually updating something
*crosses fingers* please work!
please work...
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Fixed double-half-slabs (line 68)
remove custom level to fix merge conflicts
squirrel!
fix getting snowballs from bedrock
add jnr_dev to updaterank
fix this agaaaaain
FOOIFY IS A NOOB OKAY
fix concurrentmodificationexception
fix turfforts bug
prevent STATIONARY_LAVA from breaking in creeper smash
fix creeper smash exploding lava and bedrock
fix spleef lava issue
ishh also wanted this :P (let me know if I should remove it)
ishh wanted it...k
...
2015-08-13 01:49:00 -05:00
0ff7cee229
Merge pull request #32 in MIN/mineplex from Alex_MILKCOW to master
...
* commit 'cc24bb78d3968c0c364164fb43e19724007e3833':
Fixed Cows being able to fly if they had the Rabbit Farmer kit
Fixed new classes not appearing in repository
Milk The Cow: New Gameplay Feature - When a cow charges a farmer, any milk in their bucket will be lost
2015-08-13 01:45:56 -05:00
ed7dbddf4a
Redid how kits are done.
2015-08-13 00:12:28 -04:00
d7e28e9eb8
You can no longer have the option to Evolve if you kill while dead.
2015-08-12 13:28:31 -04:00
4f163af909
fixed a uid problem with maps
2015-08-12 18:36:29 +02:00
a7da10cb34
You no longer remain "charging" when you die.
2015-08-12 12:12:26 -04:00
ad94b63903
Blaze and Enderman now take water damage.
2015-08-12 10:46:12 -04:00
0c3c9702d9
Small fixes.
...
Added holograms to show kit abilities.
Fireworks are now client side only.
Decreased the # of emerald particles.
2015-08-12 09:44:55 -04:00
fcfb2559b8
players cannot grab slime :O
2015-08-12 14:41:33 +02:00
d1302e8dc3
fixed full msg
2015-08-12 12:42:59 +02:00
5293e24469
fixed text
2015-08-12 11:58:40 +02:00
cd5c7e7110
fixed kb
2015-08-12 11:23:19 +02:00
37e5e97020
Fix experience reward displaying as game
2015-08-12 03:08:40 -05:00
f81f5d82d6
Merge remote-tracking branch 'origin/master'
2015-08-12 03:00:16 -05:00
30f20801c7
Lets hope everything works!
2015-08-12 03:00:07 -05:00
860127631c
fixed item insta-despawn
2015-08-12 09:27:05 +02:00
f19efb4a93
renamed football to soccer
2015-08-12 09:23:00 +02:00
ade76791b3
optimized item cleaning
2015-08-12 09:12:49 +02:00
a1ba0f6d86
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
2015-08-12 09:01:20 +02:00
2a40eee9e7
Increasing radius of items despawning.
2015-08-12 09:00:13 +02:00
d6f17c609b
carl
2015-08-12 08:58:46 +02:00
7ea148a802
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 08:58:36 +02:00
e4eb286225
Fixing despawning.
2015-08-12 08:56:20 +02:00
c00f9a7aaa
Merge branch 'Bonus'
2015-08-12 08:39:31 +02:00
be699558f1
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-12 08:38:18 +02:00
af19754bcd
Implementing Carl to Arcade.
2015-08-12 08:37:54 +02:00
7cda53cb28
carl spinner in arcade/
...
tutorial fixes
2015-08-12 08:36:21 +02:00
e8963cc2af
fixed paintbrush
2015-08-12 08:10:43 +02:00
2ed388552b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-12 07:59:39 +02:00
99a94251fd
Fixes
2015-08-12 00:56:20 -05:00
8e4ae35256
Merge remote-tracking branch 'remotes/origin/master' into Bonus
2015-08-12 00:56:04 -05:00
4549c810d4
Fix for voting
2015-08-11 22:59:59 -05:00
a7cc3e1aa6
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-08-11 21:13:59 +02:00
d41ab3432f
remove paintbrush when moved away
2015-08-11 21:13:45 +02:00
72adf21bff
Gadget Paintball: Add particles on impact, change block break effect to stone break sound.
2015-08-12 06:23:13 +12:00
07bdbdde46
minor grammar issue
2015-08-11 09:55:10 -07:00
ddc663cc75
remove duplicate method
2015-08-11 09:52:04 -07:00
10f979772b
Merge remote-tracking branch 'origin/master' into foo
2015-08-11 09:51:13 -07:00
18843c2cc6
Merge branch 'Bonus'
2015-08-11 17:05:59 +02:00
83a010c215
enabled summer sale msg
2015-08-11 17:05:41 +02:00
89dab7ec85
some little fixes
2015-08-11 16:33:32 +02:00
f7d9476191
Hidden egg fix
2015-08-11 13:53:36 +02:00
5c7d140521
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 13:49:53 +02:00
e25558fc91
Animation improvements.
2015-08-11 13:49:06 +02:00
cfcfbbed3b
removed double gem
2015-08-11 13:34:32 +02:00
49d54d4dd3
doesnt count rank thingy as reward if no rank. yknow
2015-08-11 13:22:58 +02:00
b348c62a3f
Merge branch 'EventGameUpdates'
2015-08-11 13:01:33 +02:00
2d7d7f6dde
Improving messages, animations and some Items.
2015-08-11 13:01:20 +02:00
f3558b144c
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-11 12:05:23 +02:00
c821523240
removed vote broadcast.
2015-08-11 12:04:54 +02:00
1c484367a1
Add hasPoll
2015-08-11 04:57:45 -05:00
3eb7e91fbb
Removing the magical 3
2015-08-11 04:38:37 -05:00
8abefaf856
The magical +3.
2015-08-11 11:31:51 +02:00
4c32f32ced
removed game reward type
2015-08-11 11:17:20 +02:00
74b83d6851
fixed!
2015-08-11 10:56:07 +02:00
184feec875
cleany and logic
2015-08-11 10:54:24 +02:00
f66a0439e8
no need to gen so many
2015-08-11 10:34:33 +02:00
a1c10a7ec5
clean up
2015-08-11 10:33:44 +02:00
1c40478e6e
SPIN DOGGY SPIN
2015-08-11 10:32:49 +02:00
fe153bee11
Fix revert issues
2015-08-11 03:19:27 -05:00
184c592786
Merge remote-tracking branch 'origin/Bonus' into Bonus
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/VoteButton.java
2015-08-11 03:12:55 -05:00
13e7e58986
Creeper visual!
2015-08-11 03:09:21 -05:00
c177307f70
Votifier fixes
2015-08-11 02:53:54 -05:00
2c30d20cb1
changing OP method, setHost permissions and /e command.
2015-08-11 09:26:01 +02:00
b99c526169
Implementing Carl message.
2015-08-11 09:09:16 +02:00
5d3503b733
Carl rewards
2015-08-11 01:55:27 -05:00
d457e3a955
changing the setOP Event.
2015-08-11 08:36:39 +02:00
d2983b831e
Merge remote-tracking branch 'origin/Bonus' into Bonus
2015-08-11 00:35:44 -06:00
d833385df4
Fix carl spinner and ticket command, Fix polls not displaying in available count, Visual fixes
2015-08-11 00:35:02 -06:00
66f2a5df5e
renamed GAME
2015-08-11 08:32:12 +02:00
b4e8b4f1ac
cant go spinnin while its a countin!
2015-08-11 08:24:28 +02:00
3bedc4ce84
Improving animation timing.
2015-08-11 05:37:58 +02:00
bd414cd231
Merge remote-tracking branch 'origin/master' into Myst_EVO
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java
2015-08-10 19:47:53 -04:00
873a2f3c56
Changed slowness from 255 - 2
2015-08-10 19:45:40 -04:00
e81a3f7ecd
Added a method to UtilAlg.
2015-08-10 14:32:49 -04:00
a618b19b73
Small changes
2015-08-10 14:32:35 -04:00
fef269b856
Fixing /e set.
2015-08-10 17:28:27 +02:00
186e3028c2
removing temp fix "there was an error processing your request" for the Spinner.
2015-08-10 17:15:56 +02:00
3be811e480
Fixing Spinner announcements.
2015-08-10 17:08:03 +02:00
ed7b8949bb
Adding SpinnerFiller and SpinnerRewards.
2015-08-10 17:04:47 +02:00
2253a63e96
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 16:43:05 +02:00
c6beb122e3
Adding firework animations for spinner.
2015-08-10 16:42:43 +02:00
ad8781fd84
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 16:14:24 +02:00
18d11f7d68
new enums
2015-08-10 16:13:17 +02:00
7492ed310e
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 15:33:26 +02:00
65fc81a2aa
improving animations again.
2015-08-10 15:33:00 +02:00
db70df1bf4
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
2015-08-10 14:51:39 +02:00
65b51a137c
new party tute room
2015-08-10 14:50:44 +02:00
1804d668e1
A few small tweaks. Removed the "Frozen" effect.
2015-08-10 08:42:03 -04:00
aea081c292
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
2015-08-10 14:01:12 +02:00
5781009f4e
Improving animations and some text.
2015-08-10 14:00:40 +02:00
bd2c9aa5e6
hub stuff
2015-08-10 14:00:02 +02:00
aa13bcf5c6
Bug fix!
2015-08-10 04:54:01 -05:00
adb76b0681
Fix giving out gold
2015-08-10 04:51:46 -05:00
8745884153
Various fixes
2015-08-10 04:51:11 -05:00
b8b19ed4a5
Merge remote-tracking branch 'remotes/origin/master' into Bonus
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2015-08-10 03:24:59 -05:00
6f8d6f8a40
Move Bonus and Poll to core
2015-08-10 01:55:50 -05:00
a0be3fa964
Use atomic mysql operations for modifying tickets
2015-08-10 01:19:10 -05:00
511cc76bef
Allow servers to process votifier votes, redis command gets sent to all servers (Until I can figure out why EU playertracker isnt working)
2015-08-10 00:47:36 -05:00
28806aaf0a
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
2015-08-10 00:33:54 -05:00
463dfc7049
Minor Tweaks.
...
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
2015-08-10 00:21:48 -04:00
a19cd3559d
Renamed "Shift" to "Crouch"
2015-08-09 23:26:59 -04:00
158dcdc01e
Created a new way to Evolve.
...
• Getting a kill presents you the option "Hold Shift to Evolve"
• Holding shift for about 5 seconds evolves you as normal.
2015-08-09 23:25:26 -04:00
d20fe54010
Disable carl features when carl can't be found
2015-08-09 16:36:48 -05:00
f8a6a25b46
Various Fixes.
...
• Merged w/ master
• Changed to William's method of Projectile limiting.
- Prevented TNT hitting Teammates
• Fixed gem count for Sniper
• Added gems for direct hits + TNT Thrown
• Removed assists counting for kills in 6 kill.
2015-08-09 15:01:27 -04:00
d9a8830e75
Few changes
2015-08-09 14:34:55 -04:00
c2d066a576
ui fixes
2015-08-09 19:31:24 +02:00
41dcc564c9
polish polish polish
...
MAKE IT SHINE!
2015-08-09 19:02:07 +02:00
ee65c72e86
and wizards!
2015-08-09 18:46:02 +02:00
8c66ef7f15
changing Hub items and adding Profile GUI.
2015-08-09 18:33:44 +02:00
fdfc9ae99d
longer games wont announce stay msgs
2015-08-09 18:17:29 +02:00
ac5ff08fad
Git fix
2015-08-09 17:23:38 +02:00
5a7de8ef3d
hub fixes
2015-08-09 17:21:56 +02:00
Shaun Bennett
Sarah
Mysticate
libraryaddict
Jonathan Williams
Mini-Chiss
fooify