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 |
|
Shaun Bennett
|
1e9abaf002
|
[Arcade] Add more games to private servers
|
2015-05-15 23:38:43 -05:00 |
|
libraryaddict
|
f899194e3b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-15 12:23:27 +12:00 |
|
libraryaddict
|
091f98fa9d
|
DrawMyThing: Remove all found words from the checked string when looking for multiple guesses
|
2015-05-15 12:23:05 +12:00 |
|
Shaun Bennett
|
6b7c52cb87
|
[Arcade] Add additional hub clock check
|
2015-05-14 15:17:45 -05:00 |
|
Jonathan Williams
|
5a8f93f3db
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-14 00:12:22 -07:00 |
|
Jonathan Williams
|
b7cdc82cd2
|
Fixed server sorter for UHC.
Work on converting to UltraDNS api.
|
2015-05-14 00:12:13 -07:00 |
|
Mini-Chiss
|
d390d83dd1
|
removed some meh words
|
2015-05-13 22:35:26 -05:00 |
|
Mini-Chiss
|
f49c2ca546
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 22:27:41 -05:00 |
|
Shaun Bennett
|
0d2157b4f3
|
[Core] Fix /stats lava bucket bug
|
2015-05-13 23:23:43 -05:00 |
|
Shaun Bennett
|
2c020d10a6
|
Merge remote-tracking branch 'origin/master'
|
2015-05-13 22:52:22 -05:00 |
|
Shaun Bennett
|
84c53347f8
|
[Hub] Add UHC to Quick server menu. Better formatting coming soon!
|
2015-05-13 22:52:14 -05:00 |
|
Mini-Chiss
|
e68a2775e8
|
ex p chnage
|
2015-05-13 22:27:33 -05:00 |
|
libraryaddict
|
67f1e4ad1f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-14 14:29:43 +12:00 |
|
libraryaddict
|
0fc1d680af
|
UHC: Add 20 seconds of invincibility on game start
|
2015-05-14 14:29:30 +12:00 |
|
Mini-Chiss
|
44cb6d8a62
|
increased exp more
|
2015-05-13 17:08:56 -05:00 |
|
libraryaddict
|
4bc38e3396
|
Arcade: Removed ocean, river and swampland from biome generation for UHC
|
2015-05-14 09:55:22 +12:00 |
|
Jonathan Williams
|
a6cf1309ff
|
Fix for ranks not applying.
|
2015-05-13 14:33:31 -07:00 |
|
Jonathan Williams
|
5bb91f4167
|
Catch null taskList
|
2015-05-13 14:27:35 -07:00 |
|
libraryaddict
|
c46bdfd2dc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-14 09:18:51 +12:00 |
|
libraryaddict
|
1b27e84e54
|
DrawMyThing: Fixed a check being in the wrong brackets
|
2015-05-14 09:18:35 +12:00 |
|
Mini-Chiss
|
093bbde792
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 15:45:41 -05:00 |
|
Mini-Chiss
|
2c3116a7a6
|
removed firework and sound from legend join
|
2015-05-13 15:45:29 -05:00 |
|
Mini-Chiss
|
bd58c06017
|
fixed being able to team with self in UHC
fixed eventgame admin toggle
|
2015-05-13 13:32:20 -05:00 |
|
Mini-Chiss
|
c34cac42ee
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 13:20:14 -05:00 |
|
Mini-Chiss
|
c26174ffa2
|
fixed team name
|
2015-05-13 13:20:05 -05:00 |
|
Jonathan Williams
|
3b024de521
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-13 01:35:05 -07:00 |
|
Jonathan Williams
|
1c6a12528c
|
Added ability for LT to modify Admin ranks.
Added Twithc rank to the updateRank list.
Fixed server sorting issues with UHC Generating servers.
|
2015-05-13 00:58:45 -07:00 |
|
libraryaddict
|
bfb5e85efd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 19:14:56 +12:00 |
|
libraryaddict
|
938386bf77
|
Wizards: Removed chainmail loot, added gold armor instead
|
2015-05-13 19:14:40 +12:00 |
|
Jonathan Williams
|
98dcb9747a
|
Added UHC support to server sorter.
|
2015-05-13 00:10:17 -07:00 |
|
Jonathan Williams
|
504d23ba06
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-05-13 00:10:01 -07:00 |
|
Jonathan Williams
|
82903fde47
|
Updates for task conversion.
|
2015-05-13 00:00:37 -07:00 |
|
Mini-Chiss
|
a744a466a3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 00:05:10 -05:00 |
|
Mini-Chiss
|
f9735006b8
|
removed hub uhc hourly announcements
|
2015-05-13 00:05:00 -05:00 |
|
libraryaddict
|
20aeccb3be
|
Wizards: Lowered ice shards max level to 3, removed damage from web shot
|
2015-05-13 14:04:19 +12:00 |
|
Jonathan Williams
|
aee0952c17
|
Added methods to convert tasks.
|
2015-05-12 18:59:22 -07:00 |
|
libraryaddict
|
744c867990
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-05-13 13:19:09 +12:00 |
|
libraryaddict
|
d2e37df4ca
|
DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word
|
2015-05-13 13:18:54 +12:00 |
|
libraryaddict
|
a75aab7f98
|
DrawMyThing: Added more words, fixed the multiple guesses prevention never firing.
|
2015-05-13 13:15:53 +12:00 |
|
Shaun Bennett
|
678c2c514a
|
Oops!
|
2015-05-12 18:45:01 -05:00 |
|
Shaun Bennett
|
aa5898e1db
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 18:43:48 -05:00 |
|
Shaun Bennett
|
f9269b534f
|
[Core] Add look AI to NPC's
|
2015-05-12 18:43:26 -05:00 |
|
Shaun Bennett
|
32338cfce4
|
[MB] More words for update
|
2015-05-12 17:25:37 -05:00 |
|
Shaun Bennett
|
d703070810
|
[Core] Shrink stat page
|
2015-05-12 17:20:58 -05:00 |
|
Shaun Bennett
|
bdfffa3a4c
|
Merge remote-tracking branch 'origin/master'
|
2015-05-12 17:14:57 -05:00 |
|
Shaun Bennett
|
53555a42cd
|
[Core] Add MB Stats in gui, Add MB Achievement, Update stat gui layout, add ability to display combined stats
|
2015-05-12 17:14:50 -05:00 |
|
libraryaddict
|
03c384e7e6
|
Wizards: Remove boat from loot, fix napalm typo
|
2015-05-13 10:04:05 +12:00 |
|