Jonathan Williams
|
47099a0b20
|
Changed default redis ip to new us redis.
Changed previous server to gold text when sending to new server.
|
2015-06-12 15:45:54 -05:00 |
|
Cheese
|
a141cec104
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-11 08:57:04 +10:00 |
|
Cheese
|
390ffcab6d
|
bridges support for lillypads map
|
2015-06-11 08:56:32 +10:00 |
|
Jonathan Williams
|
f0ce43ca5a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-09 13:22:45 -05:00 |
|
Shaun Bennett
|
a20f41be09
|
Merge remote-tracking branch 'origin/master'
|
2015-06-09 13:21:26 -05:00 |
|
Shaun Bennett
|
3f9010fb7a
|
Fix GameScore comparator
|
2015-06-09 13:21:15 -05:00 |
|
libraryaddict
|
37c6593753
|
Hub: Fix rulebook
|
2015-06-10 05:27:19 +12:00 |
|
libraryaddict
|
2971761a5e
|
Game stop command: Move unregister of game listener after the gamestate has been changed
|
2015-06-09 22:19:03 +12:00 |
|
Jonathan Williams
|
c6352445cf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-08 23:18:06 -05:00 |
|
libraryaddict
|
1f08c989b5
|
Minestrike: Enforce resource pack
|
2015-06-09 03:31:24 +12:00 |
|
libraryaddict
|
8cf10afb1b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-06-06 18:31:08 +12:00 |
|
libraryaddict
|
fd3232f45d
|
Mineware: Rename old MineWare and move packages
|
2015-06-06 18:30:47 +12:00 |
|
libraryaddict
|
ef9c69f356
|
UtilShapes: Fix a method, add a space in OldMineWare in GameType
|
2015-06-06 18:08:37 +12:00 |
|
libraryaddict
|
5f2810ae37
|
SurvivalGames: Fix anyone able to start game
|
2015-06-06 18:07:55 +12:00 |
|
Cheese
|
f9b49caeed
|
More gems for bridges/sg kills
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
|
2015-06-05 12:21:20 +10:00 |
|
libraryaddict
|
3a6c030f01
|
ConditionManager: Use a scheduler if the potion effect is being removed due to potion effect's doing something
|
2015-06-04 16:01:52 +12:00 |
|
libraryaddict
|
a961e5f0d5
|
Wizards: Don't gain wands from stats page
|
2015-06-02 18:49:50 +12:00 |
|
libraryaddict
|
4d8a54e7ba
|
Wizards: Add spellbook on /spec
|
2015-06-02 18:49:27 +12:00 |
|
libraryaddict
|
bcdb851e21
|
Teleport: Don't disqualify staff if they are not alive
|
2015-06-02 18:48:45 +12:00 |
|
libraryaddict
|
35c005feb8
|
Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players
|
2015-05-30 10:30:30 +12:00 |
|
libraryaddict
|
092447170e
|
Game Border: Fix typo that offsets border by one block
|
2015-05-30 10:24:15 +12:00 |
|
libraryaddict
|
ae41f232b0
|
GameType: Change to reflection for creating game instances
|
2015-05-30 10:23:46 +12:00 |
|
libraryaddict
|
574dd16022
|
Hub: Modify rulebook
|
2015-05-30 10:20:28 +12:00 |
|
libraryaddict
|
6c9963e1b3
|
CommandCenter: Cancel command event straight after verifying that its been registered
|
2015-05-30 05:44:49 +12:00 |
|
Shaun Bennett
|
7d43b146b7
|
[Core] Display Games Played instead of Losses for a bunch of the arcade games where losses will be greater than wins
|
2015-05-28 19:05:45 -05:00 |
|
Shaun Bennett
|
cc1219fd38
|
[Spigot] Spigot class change for Ty
|
2015-05-28 15:24:10 -05:00 |
|
Jonathan Williams
|
2c5471cb34
|
Added ability to see which server you were sent from.
|
2015-05-28 09:33:49 -05:00 |
|
libraryaddict
|
d84bd4ffe4
|
Messaging: Now with censors!
|
2015-05-28 10:13:31 +12:00 |
|
Shaun Bennett
|
a900a2a70a
|
[Arcade] Another attempt at fixing spectator gui.... :^)
|
2015-05-26 19:50:01 -05:00 |
|
Shaun Bennett
|
25ba20e411
|
[Arcade] Fixes for DMT and DT not counting loses properly
|
2015-05-26 19:28:42 -05:00 |
|
Shaun Bennett
|
0499e1acf1
|
Merge remote-tracking branch 'origin/master'
|
2015-05-26 18:55:42 -05:00 |
|
libraryaddict
|
e15e42afae
|
UHC: Expanded from 32 blocks to 36
|
2015-05-27 02:40:27 +12:00 |
|
libraryaddict
|
b8cd2aaece
|
UHC: Expand anti-build protection from 16 blocks to 32
|
2015-05-26 11:04:27 +12:00 |
|
libraryaddict
|
c53d52ee42
|
UHC: Disable gadgets
|
2015-05-24 20:17:39 +12:00 |
|
libraryaddict
|
21aa97b3b9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-24 20:13:43 +12:00 |
|
libraryaddict
|
63e28e25c9
|
HoleInTheWall: Push the failed game
|
2015-05-24 20:10:56 +12:00 |
|
libraryaddict
|
0d0d5eea64
|
Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1
|
2015-05-24 20:10:16 +12:00 |
|
Jonathan Williams
|
96b1df4ee0
|
Fixed global player count.
Fixed tasks.
|
2015-05-22 14:33:25 -07:00 |
|
Jonathan Williams
|
303cfd02fa
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 23:12:27 -07:00 |
|
Jonathan Williams
|
f0c7f2fe76
|
Merge branch 'MSSQL_Conversion'
Conflicts:
Website/LOCWebsite.suo
|
2015-05-17 23:11:50 -07:00 |
|
Jonathan Williams
|
476dd17ffe
|
Fix for null rank in /c staff server.
|
2015-05-17 23:11:04 -07:00 |
|
Shaun Bennett
|
c107f4d0d9
|
[Arcade] Working on private servers
|
2015-05-17 16:31:09 -05:00 |
|
Shaun Bennett
|
5cd191f582
|
Merge remote-tracking branch 'origin/master'
|
2015-05-17 16:29:01 -05:00 |
|
Jonathan Williams
|
375b23db3c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 13:46:46 -07:00 |
|
Ty Sayers
|
afb0b1cfdf
|
Add Charset argument for reading File lines in ServerManager, ideally to prevent compilation issues with other java versions.
|
2015-05-17 14:50:22 -04:00 |
|
Jonathan Williams
|
e728edb44d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-17 01:29:49 -07:00 |
|
Jonathan Williams
|
47ff9101fd
|
Finished up changes for game task conversion.
|
2015-05-17 01:28:44 -07:00 |
|
Ty Sayers
|
e8d5d50162
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex
|
2015-05-16 13:13:53 -04:00 |
|
Ty Sayers
|
672fc99a3e
|
Add fail-safe default connection in case of issue in proper redis-config.dat generation. Add documentation to clarify purposes related to redis configuration.
|
2015-05-16 13:12:20 -04:00 |
|
Ty Sayers
|
a8b0dddf17
|
Add support for redis configuration file to determine viable redis master and slave connections, that can be set to be region-dependant. Fix leakage issue with command manager with not properly returning broken jedis resources. Funnel all redis connection requests through ServerManager for easier configuration use.
|
2015-05-16 13:01:21 -04:00 |
|