Jonathan Williams
|
f652ad8448
|
Removing ancient projects that are no longer used.
|
2015-07-13 13:41:57 -05:00 |
Mysticate
|
df60659786
|
Core edits
|
2015-07-13 12:14:25 -04:00 |
Ben Sihota
|
b1b8fa59f7
|
Update IntelliJ builds
|
2015-07-12 21:11:39 -07:00 |
Mysticate
|
616c444c16
|
Added some things and stuff
|
2015-07-12 18:15:33 -04:00 |
Mysticate
|
0a09ae29f3
|
Merge remote-tracking branch 'origin/master' into BombLobbers
|
2015-07-12 18:14:25 -04:00 |
Mysticate
|
d0180910e9
|
Added two new kits.
|
2015-07-11 10:25:04 -04:00 |
Mysticate
|
0353b8571d
|
Merge branch 'BombLobbers' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into BombLobbers
|
2015-07-10 16:41:29 -04:00 |
Jonathan Williams
|
96a93b6786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-10 15:32:25 -05:00 |
Jonathan Williams
|
7684e1837d
|
Added new support staff to whitelist.
|
2015-07-10 15:31:38 -05:00 |
Mysticate
|
f812fd0530
|
Please push please
|
2015-07-10 16:31:37 -04:00 |
Jonathan Williams
|
f8b3431305
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 11:08:22 -05:00 |
Jonathan Williams
|
a20a9ba9e7
|
Fixed issue and updated bungee motd manager.
|
2015-07-09 11:07:43 -05:00 |
Jonathan Williams
|
77a63f72cc
|
Updated staff server white list.
|
2015-07-09 11:07:16 -05:00 |
Jonathan Williams
|
ecd8e3d7b0
|
Increased wait time for redis.
|
2015-07-09 11:07:00 -05:00 |
Mysticate
|
9e07be51c7
|
Bug fixes
|
2015-07-09 12:03:56 -04:00 |
Mysticate
|
1b3d7f1c20
|
Fixed and added things
|
2015-07-08 23:57:48 -04:00 |
Cheese
|
49daf597b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-09 12:47:57 +10:00 |
Cheese
|
7d073fdc0d
|
fixed skywars icon
changed LOSSES to GAMESPLAYED for consistency
|
2015-07-09 12:47:40 +10:00 |
Sarah
|
068b7bdd47
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-07-09 03:48:44 +02:00 |
Sarah
|
5babd8a41a
|
Fix number formatting for different system locale
|
2015-07-09 03:45:57 +02:00 |
libraryaddict
|
7e3fdef2e8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-08 18:43:56 +12:00 |
libraryaddict
|
1f250bf951
|
MineWare: Add current progress
|
2015-07-08 18:43:37 +12:00 |
Ben Sihota
|
ca880371a6
|
Merge remote-tracking branch 'origin/master'
|
2015-07-07 21:19:43 -07:00 |
Cheese
|
480a29b874
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-08 13:55:16 +10:00 |
Cheese
|
e36b0440a4
|
Merge branch 'bench'
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
Plugins/Mineplex.StaffServer/.classpath
|
2015-07-08 13:55:01 +10:00 |
Ben Sihota
|
ffbee4a9aa
|
Add more details to /game
Fix NPE with /game set
|
2015-07-07 18:20:27 -07:00 |
libraryaddict
|
9eff5b7245
|
Perks: Forgot to include this in last commit, no harm done.
|
2015-07-08 07:51:33 +12:00 |
Jonathan Williams
|
7bf440f786
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-07 05:18:15 -04:00 |
libraryaddict
|
2bec753a34
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-07 12:30:37 +12:00 |
libraryaddict
|
bff3897fab
|
Perks and kits: Change priority for unregistering to high, add new method to Perk firing when perk listener is registered.
|
2015-07-07 12:30:20 +12:00 |
Shaun Bennett
|
6c8c3946a3
|
Revert "Add IntelliJ IDE library files"
This reverts commit 71d696278d .
|
2015-07-06 17:06:29 -05:00 |
Ben Sihota
|
71d696278d
|
Add IntelliJ IDE library files
|
2015-07-06 13:48:47 -07:00 |
Cheese
|
cca26165cd
|
swapped sale back to 50%
|
2015-07-06 11:42:54 +10:00 |
libraryaddict
|
2c249e37b5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-07-06 07:07:56 +12:00 |
libraryaddict
|
e16cb4cef7
|
Disguise: Initite armorstand vector
|
2015-07-06 07:07:41 +12:00 |
libraryaddict
|
3d0dda382b
|
Stacker: Fixed an infinite loop
|
2015-07-06 07:07:19 +12:00 |
Shaun Bennett
|
abaa0ddee8
|
Level for Bobby
|
2015-07-05 13:30:16 -05:00 |
Cheese
|
7182205fde
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-07-05 15:13:33 +10:00 |
Cheese
|
8d2b1650af
|
world component for MCPE
|
2015-07-05 15:13:18 +10:00 |
libraryaddict
|
e002e4af18
|
Disguises: Added ArmorStandDisguise, removed unused DisguiseType and added ability to add fake armor to disguises
|
2015-07-05 13:37:07 +12:00 |
Jonathan Williams
|
cf035eeb37
|
Fixed Bungee issues with new redis configs.
|
2015-07-03 02:17:27 -04:00 |
Cheese
|
556e524e18
|
changed notifications back to 75% sale
|
2015-07-02 16:14:47 +10:00 |
Cheese
|
1e26ebe0bd
|
disabled ice forming
|
2015-07-02 10:09:39 +10:00 |
Cheese
|
0100ca1b8c
|
fixed a derp bug
|
2015-07-02 09:41:33 +10:00 |
Cheese
|
dd9fc8e7c6
|
bridge speed increase
|
2015-07-01 15:14:46 +10:00 |
Cheese
|
0650b73374
|
more bridge tweaks
|
2015-07-01 14:16:56 +10:00 |
Cheese
|
190e58c37e
|
bridges update
|
2015-07-01 12:58:54 +10:00 |
Cheese
|
de36e3d8e4
|
added WATER_DAMAGE support for maps
modified some bridges code
|
2015-07-01 00:18:06 +10:00 |
Jonathan Williams
|
c6e4c5c5e4
|
Fixed mineplexer server status link.
Fixed issue with ServerManager and default connection.
|
2015-06-30 03:49:53 -04:00 |
Cheese
|
e3d060376b
|
disabled double gem
|
2015-06-30 13:10:08 +10:00 |
Ty Sayers
|
cd4bebbeee
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-06-29 19:27:23 -04:00 |
Ty Sayers
|
1992205393
|
Modify RedisConfiguration deserialization options to allow for more dynamic distribution of redis server types and data handling. Servers are now defined individually with metadata representing server type (master/slave) and custom connection names for data redirection on server start up.
|
2015-06-29 19:27:05 -04:00 |
Jonathan Williams
|
2069524f15
|
Merge remote-tracking branch 'remotes/origin/foo'
|
2015-06-29 18:14:07 -04:00 |
Jonathan Williams
|
bbb661d686
|
Fixed up BenefitManager.
|
2015-06-29 18:07:06 -04:00 |
fooify
|
4ff456b722
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-06-29 11:29:22 -07:00 |
Jonathan Williams
|
d426c24970
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:14:30 -04:00 |
Cheese
|
da3c5eeaaf
|
40k b enefit
|
2015-06-29 20:14:15 +10:00 |
Jonathan Williams
|
9f384b0d3e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-29 06:02:57 -04:00 |
Cheese
|
48f5fa118a
|
fixed a few sky bugs
|
2015-06-29 14:26:00 +10:00 |
Cheese
|
2963f7a61c
|
stacker wont give too many msgs
|
2015-06-29 10:13:33 +10:00 |
Cheese
|
b0f8369bcd
|
lowered block falling speed.
fixed a bug where some chests didnt fall
|
2015-06-29 10:09:36 +10:00 |
Cheese
|
0ea388379a
|
reduced win req for skywars ach
enabled beenfit for 40k reward
|
2015-06-28 15:16:05 +10:00 |
Cheese
|
ead402d026
|
skywars art
|
2015-06-28 14:31:25 +10:00 |
Cheese
|
08e4ef199e
|
added twitch to dguisecmd
|
2015-06-28 12:53:18 +10:00 |
Cheese
|
faca14dd23
|
fixed disguise permission
|
2015-06-28 12:50:27 +10:00 |
Cheese
|
840ebabf2a
|
added delay on mad scientist eggSpawn
fixed Exp bug
|
2015-06-27 20:39:05 +10:00 |
Jonathan Williams
|
65a10461cd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java
|
2015-06-27 02:29:07 -05:00 |
Jonathan Williams
|
9a4bcd29a1
|
Fixed Sparks problems...
|
2015-06-27 02:26:29 -05:00 |
Cheese
|
1f34bc40a3
|
increased time you can hold TNT for in CS
|
2015-06-27 14:08:16 +10:00 |
Cheese
|
4c164ce2a6
|
enabled double gems
|
2015-06-27 12:44:43 +10:00 |
Cheese
|
d0368a19d8
|
Players who quit early do not get full game worth of EXP.
|
2015-06-27 12:38:04 +10:00 |
Cheese
|
754026f403
|
chicken teleport fix
scientist minion name fix
|
2015-06-27 12:18:12 +10:00 |
Cheese
|
4183d6f21d
|
some balance
|
2015-06-27 11:40:40 +10:00 |
Cheese
|
270a2e4107
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-27 11:24:33 +10:00 |
Cheese
|
4e06a1aae3
|
fixed a few skywars bugs
improved warning for bridges
|
2015-06-27 11:24:01 +10:00 |
fooify
|
4b634d1bc3
|
Fix slashes (this won't affect windows users, right?)
|
2015-06-26 10:14:37 -07:00 |
fooify
|
333c54cff9
|
Merge branch 'master' into foo
|
2015-06-26 10:07:13 -07:00 |
Shaun Bennett
|
8ef52ea103
|
Mineplex Gold Rush 2.0
|
2015-06-26 10:50:37 -05:00 |
Cheese
|
9a0ac821a2
|
fixed stat bug
|
2015-06-26 19:44:13 +10:00 |
Cheese
|
c0bc522614
|
split achievement text over 2 lines
|
2015-06-26 19:32:18 +10:00 |
Cheese
|
750769d03a
|
fixed gem thing
|
2015-06-26 19:12:34 +10:00 |
Cheese
|
62a7fd6a99
|
you now get levels for kills/assists
fixed scoreboard bug
|
2015-06-26 19:12:11 +10:00 |
Cheese
|
b0019242e7
|
skywars scoreboard fix
|
2015-06-26 19:02:34 +10:00 |
Jonathan Williams
|
8c427bee24
|
Fix _gameDisplay bug.
Fix Skywars quickmenu link.
|
2015-06-26 03:57:39 -05:00 |
Jonathan Williams
|
8f2c0cf9d8
|
Fix file names.
|
2015-06-26 03:15:16 -05:00 |
Jonathan Williams
|
62cfa215b2
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 03:12:09 -05:00 |
Jonathan Williams
|
c1ef96bdcd
|
Fixed jre for staff server
|
2015-06-26 03:12:00 -05:00 |
Shaun Bennett
|
c158a6f89f
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 03:10:53 -05:00 |
Shaun Bennett
|
3b6a692a2a
|
Ooops
|
2015-06-26 03:10:44 -05:00 |
Cheese
|
1aa0832bb9
|
SkyWars to Skywars
|
2015-06-26 17:55:49 +10:00 |
Cheese
|
9bf58a2d98
|
disabled pistons
|
2015-06-26 17:47:04 +10:00 |
Cheese
|
1564a8bc51
|
disabled hoppers
|
2015-06-26 17:46:05 +10:00 |
Cheese
|
17af562f19
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 17:36:25 +10:00 |
Cheese
|
59f730ae9d
|
changed sky text and icon to feather
|
2015-06-26 17:36:12 +10:00 |
Jonathan Williams
|
f906f08a18
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:34:36 -05:00 |
Shaun Bennett
|
2657ef336a
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 02:33:00 -05:00 |
Shaun Bennett
|
60901cc17e
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
|
2015-06-26 02:32:51 -05:00 |
Cheese
|
c31d3609bb
|
soup no longer spawns in stacks
|
2015-06-26 17:32:46 +10:00 |
Shaun Bennett
|
7c698f65cf
|
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
|
2015-06-26 02:31:35 -05:00 |
Jonathan Williams
|
c78ef9d93d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:30:01 -05:00 |