Shaun Bennett
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00
Shaun Bennett
bb197ff629
Merge War and Energy
2015-02-03 14:14:52 -05:00
Shaun Bennett
b0a2e655c1
Changes to IntellIJ Files
2015-02-03 14:12:52 -05:00
Shaun Bennett
6cefeb1b74
More work on War
2015-02-03 14:02:45 -05:00
libraryaddict
87f038d21d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-03 22:03:26 +13:00
libraryaddict
e91d76960c
Add a toggleable friends GUI - Chat to Inventory and back
2015-02-03 22:03:07 +13:00
Jonathan Williams
f1930ed7c1
Only record bungee stats for your region...servermonitor
2015-02-01 00:56:18 -08:00
libraryaddict
9118aef60f
Even if death is not the end, refuse players re-entry if they were in the lobby when they quit.
2015-02-01 16:03:29 +13:00
libraryaddict
01fa5b5882
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-01 12:19:51 +13:00
libraryaddict
ea24bc1d87
Prevent treasure chests being opened from interfering with portals, ladders, etc.
2015-02-01 12:19:33 +13:00
Jonathan Williams
56fd245032
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-31 14:19:45 -08:00
Jonathan Williams
9d3f5f9bc8
Fixed reconnect for bungee connection in StatusHistoryRepository
...
Added error catching to ServerMonitor so it doesn't stall program.
2015-01-31 14:19:33 -08:00
libraryaddict
f9cbab6fd8
SuperSmash no longer restores hunger unless you damage a player, not a entity
2015-02-01 09:47:00 +13:00
libraryaddict
4f9f0afa29
BlockToss can no longer pickup blocks next to ladders
2015-02-01 09:40:36 +13:00
libraryaddict
6f369cbcdb
Sort players in spectator menu by name
2015-02-01 08:25:38 +13:00
libraryaddict
eccc2f2fb0
Fixed bug with dropping gadget items interfering with games and being set in the wrong slot with the wrong name
2015-02-01 08:04:19 +13:00
Chiss
0c2054ac32
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 20:49:51 +11:00
Chiss
f03c9d5bab
Fixed damage rate on barrage
2015-01-30 20:48:46 +11:00
Jonathan Williams
ff56578d15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:29:12 -08:00
Jonathan Williams
49bfe385bf
Revert "Work on treasure............"
...
This reverts commit 50a8fb03a9
2015-01-29 22:28:41 -08:00
libraryaddict
ff73c88182
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 19:28:29 +13:00
libraryaddict
a1529e0884
Notify player when no friends found when searching
2015-01-30 19:28:04 +13:00
Jonathan Williams
352a29390b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 22:19:12 -08:00
Jonathan Williams
ed08e4b112
Changed coloring for server line in friends gui.
2015-01-29 22:18:59 -08:00
Chiss
115f9b58ab
Spider nest :)
2015-01-30 17:02:28 +11:00
Shaun Bennett
9b5b1f635f
Merge remote-tracking branch 'origin/master'
2015-01-30 00:37:16 -05:00
Shaun Bennett
96ce95b72e
treasure changes
2015-01-30 00:37:02 -05:00
Chiss
5b112caa4a
Bone Storm buff
2015-01-30 16:10:03 +11:00
Chiss
c066cb5185
Fixed Bugs
2015-01-30 16:08:22 +11:00
Chiss
3fdf914d63
Smash Wolf Update!
2015-01-30 15:18:50 +11:00
Chiss
76b76cd38c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 14:42:51 +11:00
Chiss
c8afa151d9
SSM Zombie + Spider Update
2015-01-30 14:42:39 +11:00
Shaun Bennett
79a60db15d
More tweaks
2015-01-29 22:41:54 -05:00
Shaun Bennett
1cc0879ce9
treasure stuff
2015-01-29 22:17:46 -05:00
Jonathan Williams
81a52184c9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-01-29 17:50:24 -08:00
Jonathan Williams
b14d09ed2c
Reduced connection checking to every 2 minutes.
...
Removed kill script call as it was encountering access errors..
2015-01-29 17:47:59 -08:00
libraryaddict
505dcc1e8e
Add friends gui, deprecate the old chatbased friends display
2015-01-30 13:46:07 +13:00
Chiss
e18107a82f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-30 11:08:37 +11:00
Chiss
6a269cc03b
More SSM Changes
2015-01-30 11:08:23 +11:00
Shaun Bennett
50a8fb03a9
Work on treasure............
2015-01-29 18:37:29 -05:00
Jonathan Williams
908533b232
Added some exception protection in Redis retrieve dedicated servers.
...
Removed Statifier project.
Improved ServerMonitor:
- Added recording of dedicated server stats
- Added recording of server group stats
- Added recording of bungee stats
- Added recording of network stats
2015-01-29 07:05:50 -08:00
libraryaddict
ebc74e5565
Fireball still too fast
2015-01-29 15:01:00 +13:00
Chiss
7f4bcd1210
Smash Update
...
new scoreboard (not implemented yet)
reward changes
2015-01-29 11:54:59 +11:00
libraryaddict
2dfdde4457
Kit mage will now start with two spells
2015-01-28 03:01:44 +13:00
libraryaddict
1da873ab8f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-01-27 21:09:31 +13:00
libraryaddict
94f79990e4
Kit changes to wizards
2015-01-27 21:09:15 +13:00
Chiss
290e4d69df
map parser update
2015-01-27 13:59:28 +11:00
Chiss
19208de075
mroe map parser ^_^
2015-01-26 11:53:48 +11:00
Chiss
90573903da
added new gametypes for parser
2015-01-26 11:33:47 +11:00
Chiss
b98950b121
map parser visual changes
2015-01-26 11:31:42 +11:00
