Sarah
|
7492ed310e
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-10 15:33:26 +02:00 |
|
Sarah
|
65fc81a2aa
|
improving animations again.
|
2015-08-10 15:33:00 +02:00 |
|
Mini-Chiss
|
db70df1bf4
|
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
|
2015-08-10 14:51:39 +02:00 |
|
Mini-Chiss
|
65b51a137c
|
new party tute room
|
2015-08-10 14:50:44 +02:00 |
|
Mysticate
|
1804d668e1
|
A few small tweaks. Removed the "Frozen" effect.
|
2015-08-10 08:42:03 -04:00 |
|
Sarah
|
aea081c292
|
Merge branch 'Bonus' of http://184.154.0.242:7990/scm/min/mineplex into Bonus
|
2015-08-10 14:01:12 +02:00 |
|
Sarah
|
5781009f4e
|
Improving animations and some text.
|
2015-08-10 14:00:40 +02:00 |
|
Mini-Chiss
|
bd2c9aa5e6
|
hub stuff
|
2015-08-10 14:00:02 +02:00 |
|
Shaun Bennett
|
aa13bcf5c6
|
Bug fix!
|
2015-08-10 04:54:01 -05:00 |
|
Shaun Bennett
|
adb76b0681
|
Fix giving out gold
|
2015-08-10 04:51:46 -05:00 |
|
Shaun Bennett
|
8745884153
|
Various fixes
|
2015-08-10 04:51:11 -05:00 |
|
Shaun Bennett
|
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 |
|
Shaun Bennett
|
6f8d6f8a40
|
Move Bonus and Poll to core
|
2015-08-10 01:55:50 -05:00 |
|
Shaun Bennett
|
a0be3fa964
|
Use atomic mysql operations for modifying tickets
|
2015-08-10 01:19:10 -05:00 |
|
Shaun Bennett
|
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 |
|
Shaun Bennett
|
28806aaf0a
|
Update Bonus amounts, Attempting to fix Votifier plugin for EU/US
|
2015-08-10 00:33:54 -05:00 |
|
Mysticate
|
463dfc7049
|
Minor Tweaks.
• Fixed wrong evo location
• Added a "Frozen" effect when evolving.
|
2015-08-10 00:21:48 -04:00 |
|
Mysticate
|
a19cd3559d
|
Renamed "Shift" to "Crouch"
|
2015-08-09 23:26:59 -04:00 |
|
Mysticate
|
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 |
|
Shaun Bennett
|
d20fe54010
|
Disable carl features when carl can't be found
|
2015-08-09 16:36:48 -05:00 |
|
Mysticate
|
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 |
|
Mysticate
|
d9a8830e75
|
Few changes
|
2015-08-09 14:34:55 -04:00 |
|
Mini-Chiss
|
c2d066a576
|
ui fixes
|
2015-08-09 19:31:24 +02:00 |
|
Mini-Chiss
|
41dcc564c9
|
polish polish polish
MAKE IT SHINE!
|
2015-08-09 19:02:07 +02:00 |
|
Mini-Chiss
|
97c6726d1d
|
Merge branch 'Bonus' of ssh://184.154.0.242:7999/min/mineplex into Bonus
|
2015-08-09 18:46:37 +02:00 |
|
Mini-Chiss
|
ee65c72e86
|
and wizards!
|
2015-08-09 18:46:02 +02:00 |
|
Sarah
|
8c66ef7f15
|
changing Hub items and adding Profile GUI.
|
2015-08-09 18:33:44 +02:00 |
|
Mini-Chiss
|
fdfc9ae99d
|
longer games wont announce stay msgs
|
2015-08-09 18:17:29 +02:00 |
|
Sarah
|
ac5ff08fad
|
Git fix
|
2015-08-09 17:23:38 +02:00 |
|
Mini-Chiss
|
5a7de8ef3d
|
hub fixes
|
2015-08-09 17:21:56 +02:00 |
|
Sarah
|
0d70fb6b96
|
removing deop of Admins and adding OP condition to setHost.
|
2015-08-09 16:55:10 +02:00 |
|
Sarah
|
941e746ca9
|
Finalizing Poll GUI in Carl's GUI.
|
2015-08-09 16:47:03 +02:00 |
|
Sarah
|
85c8e42f53
|
Finalizing and improving the Carl spinner and adding creeper explosion animations.
|
2015-08-09 15:00:54 +02:00 |
|
Mysticate
|
b9edb92c1e
|
Ready for full on testing.
|
2015-08-09 01:08:43 -04:00 |
|
Mini-Chiss
|
b974fcf838
|
map parser fixes
|
2015-08-09 00:09:26 +02:00 |
|
Shaun Bennett
|
e6519206af
|
Add event to be called when a player tries to buy a carl spin
|
2015-08-08 16:29:03 -05:00 |
|
Mysticate
|
5298fa341e
|
Removed the revolving thing.
|
2015-08-08 16:13:54 -04:00 |
|
Mini-Chiss
|
cbb0cb96c8
|
ensured white
|
2015-08-08 13:54:35 +02:00 |
|
Mini-Chiss
|
e030331565
|
fixed some bugs
|
2015-08-08 13:51:37 +02:00 |
|
Mini-Chiss
|
fa7f19bde5
|
removed debug
|
2015-08-08 13:47:30 +02:00 |
|
Mini-Chiss
|
328c31de88
|
hub Update
fixed bad gameid
|
2015-08-08 13:47:09 +02:00 |
|
Shaun Bennett
|
4f6dfdb856
|
Update carl spin button to consume tickets, Updates to Votifier Plugin, Redis Vote Command, Various bug fixes
|
2015-08-08 06:35:25 -05:00 |
|
Mini-Chiss
|
eab7aa59f2
|
hub update!
|
2015-08-08 09:27:49 +02:00 |
|
Mini-Chiss
|
47cb98066d
|
Hub fixes
|
2015-08-08 08:19:07 +02:00 |
|
fooify
|
db521668a9
|
more changes! it's getting pretty cool now x)
|
2015-08-07 14:20:15 -07:00 |
|
Mini-Chiss
|
33c96f51ae
|
fixed some stuff
|
2015-08-07 22:59:50 +02:00 |
|
Mini-Chiss
|
090c1f135d
|
Merge branch 'SarahsAwesomeBugFixes'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
|
2015-08-07 21:48:35 +02:00 |
|
Mini-Chiss
|
b22706e649
|
hub update part 1
|
2015-08-07 21:45:38 +02:00 |
|
Mysticate
|
858e57bb0d
|
edited a few things
|
2015-08-07 14:39:29 -04:00 |
|
fooify
|
f70b1231ab
|
AI fixes and such for Monster Maze
|
2015-08-07 10:32:31 -07:00 |
|