Peter Miller
|
82ba7bf30f
|
Implementing /news list and set commands.
|
2014-07-09 20:38:11 -04:00 |
|
Jonathan Williams
|
65b2e14689
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-09 11:15:06 -07:00 |
|
Jonathan Williams
|
193bd82b61
|
Minor adjustment to rule book.
|
2014-07-09 11:14:57 -07:00 |
|
Peter Miller
|
f38af4ab8a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-08 22:56:02 -04:00 |
|
Peter Miller
|
58092c914a
|
Initial database access and method stubbing for "news" command.
|
2014-07-08 22:55:51 -04:00 |
|
Mini-Chiss
|
5cd6bcfc82
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-07-08 18:08:46 -07:00 |
|
Mini-Chiss
|
03c56535ef
|
MAPDATA
|
2014-07-08 18:08:37 -07:00 |
|
Jonathan Williams
|
97422e237f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-08 18:01:30 -07:00 |
|
Jonathan Williams
|
74817f5f2e
|
Added rule book to Hub.
Fixed mineplexer bungee internet status.
Fixed up ddosprotectionswitcher.
|
2014-07-08 18:01:03 -07:00 |
|
Mini-Chiss
|
bd6b9b8888
|
so many fix
|
2014-07-08 17:35:27 -07:00 |
|
Mini-Chiss
|
c5e05523d3
|
sneakyfix
|
2014-07-08 17:34:47 -07:00 |
|
Mini-Chiss
|
dd0040086d
|
Parser Permissions
Sneaky Assasssin thingy.
|
2014-07-08 17:33:22 -07:00 |
|
Mini-Chiss
|
4d40df45d5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-07-08 15:14:02 -07:00 |
|
Mini-Chiss
|
1455b4001f
|
Parser Update
|
2014-07-08 15:13:30 -07:00 |
|
Jonathan Williams
|
45e38a8318
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-08 15:05:12 -07:00 |
|
Jonathan Williams
|
fb5f92df2a
|
Finalized internet status for bungees
|
2014-07-08 15:04:59 -07:00 |
|
Mini-Chiss
|
424a9defa9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
|
2014-07-08 13:19:55 -07:00 |
|
Mini-Chiss
|
7fcee333aa
|
Merge
|
2014-07-08 13:18:55 -07:00 |
|
Jonathan Williams
|
2e5b003cff
|
More work on internet status stuff.
Fixed some buggies with parser.
|
2014-07-08 13:18:27 -07:00 |
|
Jonathan Williams
|
2ccb27065c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-08 12:44:26 -07:00 |
|
Jonathan Williams
|
963c71f128
|
Fixed internet status stuff for bungees.
Fixed new portal arg req.
|
2014-07-08 12:44:17 -07:00 |
|
Mini-Chiss
|
848f843fbf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/WorldManager.java
|
2014-07-08 12:41:25 -07:00 |
|
Mini-Chiss
|
22709b0cd8
|
merge
|
2014-07-08 12:40:28 -07:00 |
|
Jonathan Williams
|
39b2ad57be
|
Fix for map parser zipping.
|
2014-07-08 12:37:39 -07:00 |
|
Jonathan Williams
|
6ae35f1b37
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-08 12:20:28 -07:00 |
|
Jonathan Williams
|
e6e86c2042
|
Updated DnsMadeEasy api.
Cleaned up some bungee code.
Added InternetStatus to Bungees.
Fixed some portal stuff.
|
2014-07-08 12:20:19 -07:00 |
|
Mini-Chiss
|
65e7e1e0b3
|
Parser
|
2014-07-08 12:18:43 -07:00 |
|
Mini-Chiss
|
cf25bdc44f
|
Bridges fix being able to break mid chests before gamestart
Map parser Updates
|
2014-07-07 19:04:44 -07:00 |
|
Jonathan Williams
|
082cf98e99
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-07 16:26:08 -07:00 |
|
Jonathan Williams
|
64903ae4b4
|
Work on DDoS Protection switcher
|
2014-07-07 16:25:49 -07:00 |
|
Mini-Chiss
|
ef86fe6948
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-07-07 16:24:43 -07:00 |
|
Mini-Chiss
|
62f6ea815d
|
Champs Balance Update
Map Parser Update
|
2014-07-07 16:23:55 -07:00 |
|
CoderTim
|
3490db4b6f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-07 19:10:40 -04:00 |
|
CoderTim
|
38e4240a61
|
Fully implemented Sneaky Assassins Power-Ups
|
2014-07-07 19:10:29 -04:00 |
|
Peter Miller
|
ddf1a8ff74
|
Pointed "send" command to "AddTransferRecord" method in Portal module.
Corrected "serverTarget" to "playerTarget" in "Player...does not exist!" message.
Cleaned up unnecessary references.
|
2014-07-07 17:30:03 -04:00 |
|
CoderTim
|
fe1bf95342
|
Fixed code style and updated IntelliJ code style settings
|
2014-07-07 14:45:02 -04:00 |
|
Jonathan Williams
|
a66e877028
|
Cleaned up Bungee mineplexer a bit.
Refactored send/server commands for Portal.
|
2014-07-05 10:56:20 -07:00 |
|
Jonathan Williams
|
ff8c506690
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-04 23:23:30 -07:00 |
|
Jonathan Williams
|
c882ab1b34
|
Fixed portal command stuff.
Removed temp code from PlayerTracker
Added temp project for future ddos prot switching.
|
2014-07-04 23:23:19 -07:00 |
|
Mini-Chiss
|
ce8560bdbf
|
hub news
|
2014-07-04 23:20:46 -07:00 |
|
Mini-Chiss
|
df8562e69a
|
Tourney mode for UHC
|
2014-07-04 23:11:13 -07:00 |
|
Mini-Chiss
|
c65712c260
|
UHC fixes
Sneaky Assassin listener leak fix
Some map parser stuffs.
|
2014-07-04 23:04:46 -07:00 |
|
Jonathan Williams
|
e6666932aa
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-04 14:32:41 -07:00 |
|
Jonathan Williams
|
c265c7ce5c
|
Fixed sync db Logger.java
Added temp test code in player tracker...ignore.
fixed bug in dynamic server sorter.
|
2014-07-04 14:23:11 -07:00 |
|
CoderTim
|
6365ec5351
|
Started on Sneaky Assassins kits and power-ups
|
2014-07-04 11:14:34 -04:00 |
|
CoderTim
|
2fb2aadf66
|
Merge remote-tracking branch 'origin/master'
|
2014-07-04 11:12:52 -04:00 |
|
CoderTim
|
46c979e088
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-04 11:12:33 -04:00 |
|
Peter Miller
|
b56855c33c
|
Squished remaining concurrency/checking bugs! Happy 4th o'July!
|
2014-07-04 02:19:20 -04:00 |
|
Jonathan Williams
|
d2caf23ed7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-07-03 11:19:23 -07:00 |
|
Jonathan Williams
|
b058665e93
|
Fixed sync db calls for PlayerTracker
Fixed name update with new UUID
Skeleton work for Friends
|
2014-07-03 11:18:11 -07:00 |
|