Mysticate
|
41511dce7b
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-15 21:19:24 -04:00 |
|
Cheese
|
1c52bd4f64
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-14 14:34:51 +11:00 |
|
Cheese
|
86bad0be30
|
mods can check other players skills
|
2015-10-14 14:34:30 +11:00 |
|
Shaun Bennett
|
0df637b80a
|
Run punishBot in main server thread
|
2015-10-13 22:56:14 -04:00 |
|
Mysticate
|
a049d7666f
|
Merge remote-tracking branch 'origin/master' into monster-maze
|
2015-10-13 22:14:19 -04:00 |
|
Cheese
|
45cd2a38e1
|
admins can botspam
|
2015-10-14 11:55:59 +11:00 |
|
Cheese
|
1842eae7f0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-13 23:22:58 +11:00 |
|
Cheese
|
d105ea5d7e
|
botspam addition
|
2015-10-13 23:19:48 +11:00 |
|
Jonathan Williams
|
a292fdb3c5
|
Added failsafe for ServerMonitor.
|
2015-10-12 22:26:24 -05:00 |
|
Cheese
|
f5b80c941c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-13 11:58:27 +11:00 |
|
Cheese
|
e8388437b6
|
botspam now checks for chat as well
|
2015-10-13 11:58:14 +11:00 |
|
Cheese
|
3e5ac58ae9
|
helpers!
|
2015-10-13 11:23:00 +11:00 |
|
Cheese
|
37639a413c
|
fixed skill stuff
|
2015-10-13 11:22:10 +11:00 |
|
Mysticate
|
be96842de5
|
Ultra
|
2015-10-12 17:02:34 -04:00 |
|
AlexTheCoder
|
dceba51060
|
- Fix random blockhunt bug with mounts and infestor
|
2015-10-12 03:09:40 -04:00 |
|
AlexTheCoder
|
bbb863ba92
|
- Merge conflict patch
|
2015-10-12 02:36:10 -04:00 |
|
Cheese
|
2b9a66e7b2
|
more ssm update
|
2015-10-12 16:32:23 +11:00 |
|
Shaun Bennett
|
1aecc9505c
|
Add region to titan, new MOTD
|
2015-10-12 01:30:31 -04:00 |
|
AlexTheCoder
|
bef942f6da
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
|
2015-10-12 00:47:56 -04:00 |
|
Cheese
|
6a173073a4
|
added flag to projectiles
work on cow kit
|
2015-10-12 14:39:14 +11:00 |
|
Mysticate
|
3eb36a6581
|
Prevented farming
|
2015-10-11 22:43:21 -04:00 |
|
Mysticate
|
2abf3edad4
|
Made items for titanic cosmetics dyes.
|
2015-10-11 22:29:26 -04:00 |
|
Mysticate
|
b6d573a4d5
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-11 22:25:25 -04:00 |
|
Mysticate
|
7a4ccdf680
|
Bug fixes
|
2015-10-11 22:17:34 -04:00 |
|
Mysticate
|
dda65b4c77
|
Fixed tnt exploding lobbies
|
2015-10-11 19:56:36 -04:00 |
|
Mysticate
|
20dd9c683b
|
Merge remote-tracking branch 'origin/master' into monster-maze
Conflicts:
Plugins/Mineplex.MapParser/src/mineplex/mapparser/MapParser.java
Changed the scoreboard a bit, added it to MPS.
|
2015-10-11 10:52:45 -04:00 |
|
Mysticate
|
606937d227
|
Fixed flashbang glitch
|
2015-10-11 09:42:36 -04:00 |
|
Jonathan Williams
|
e6485a9009
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-10 23:02:36 -06:00 |
|
Jonathan Williams
|
5866e0cce6
|
Reducing max connections for the DBPool to 3.
|
2015-10-10 23:02:08 -06:00 |
|
Cheese
|
f23bf18928
|
adhering to mysts OCD
|
2015-10-11 14:50:57 +11:00 |
|
Cheese
|
f3e2f3c145
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-11 14:48:17 +11:00 |
|
Cheese
|
cb9e8f8e0b
|
pumpkin smasher achievement
|
2015-10-11 14:48:02 +11:00 |
|
Mysticate
|
435e74225a
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-10 23:35:33 -04:00 |
|
Mysticate
|
83d1e011fc
|
Changes.
|
2015-10-10 23:33:54 -04:00 |
|
Jonathan Williams
|
998d5f6984
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-10 21:25:29 -06:00 |
|
Jonathan Williams
|
061a7b7c73
|
Fixed Pet FK errors.
Added SUPPORT to acceptable updateRank command.
|
2015-10-10 21:24:47 -06:00 |
|
Cheese
|
8b75664627
|
queued holiday transactions
|
2015-10-11 12:54:35 +11:00 |
|
Cheese
|
6860fa608a
|
titan placeholder perks
art
fixed pumpkin gem count
|
2015-10-11 11:26:09 +11:00 |
|
Mysticate
|
72d943f51b
|
Restored skills to pre-eula ultra
|
2015-10-10 16:20:28 -04:00 |
|
Mysticate
|
5a8e500ec0
|
Fixed another thing
|
2015-10-10 16:15:10 -04:00 |
|
Mysticate
|
5e7ddb968e
|
Changes and bug fixes.
|
2015-10-10 15:54:18 -04:00 |
|
Cheese
|
da6b1316d3
|
removed pumpkins from MPS
|
2015-10-10 22:47:19 +11:00 |
|
Cheese
|
323842c693
|
fixed mods staying in flight
|
2015-10-10 19:36:38 +11:00 |
|
Cheese
|
6f14c75f70
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-10 19:28:26 +11:00 |
|
Cheese
|
6cf786eb8c
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-10 19:28:08 +11:00 |
|
Cheese
|
1026a2ae22
|
fixed explosions
|
2015-10-10 19:27:54 +11:00 |
|
Shaun Bennett
|
a242c6b592
|
Halloween Update finishes
|
2015-10-10 03:23:37 -04:00 |
|
Cheese
|
e9207acd7f
|
Merge branch 'alex-halloween'
|
2015-10-10 17:38:09 +11:00 |
|
Cheese
|
7bc3b4970b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/titangiveaway/TitanGiveawayRepository.java
|
2015-10-10 17:34:17 +11:00 |
|
AlexTheCoder
|
67a1f4ce8d
|
Titan Giveaway:
- Added Titan pumpkin animation
Titan Perks (For later, Removed from Menu):
- Added Kronos Particle
|
2015-10-10 02:31:52 -04:00 |
|
Mysticate
|
930cfa5cb8
|
DONE
|
2015-10-10 02:30:11 -04:00 |
|
Shaun Bennett
|
f1e9acbb58
|
Titan giveaway
|
2015-10-10 02:19:05 -04:00 |
|
Mysticate
|
245a42c8e0
|
animation is sexi
|
2015-10-10 02:13:04 -04:00 |
|
Mysticate
|
30a9196430
|
Done with animation.
|
2015-10-10 01:43:31 -04:00 |
|
Mysticate
|
9a7357e484
|
Work
|
2015-10-10 01:00:49 -04:00 |
|
Shaun Bennett
|
36fabf93b6
|
Merge remote-tracking branch 'origin/master'
|
2015-10-09 23:14:13 -04:00 |
|
Shaun Bennett
|
bc7bf8a2e2
|
fixes/debug
|
2015-10-09 23:13:39 -04:00 |
|
Jonathan Williams
|
512e08af19
|
Removed all create table statements.
|
2015-10-09 21:02:35 -06:00 |
|
Mysticate
|
1127764cc3
|
Secsi
|
2015-10-09 22:44:49 -04:00 |
|
Mysticate
|
7851cb451a
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java
|
2015-10-09 22:34:05 -04:00 |
|
Shaun Bennett
|
aa9fd1abf3
|
Titan giveaway work
|
2015-10-09 22:14:10 -04:00 |
|
Mysticate
|
90c685617d
|
Animation
|
2015-10-09 22:14:01 -04:00 |
|
Peter Miller
|
611fb88f15
|
Commented out unnecessary table creation statements (tables already exist in database and these statements are causing database lag under high player load).
|
2015-10-09 20:40:50 -04:00 |
|
Cheese
|
ed89f5f4cc
|
anim example for myst
|
2015-10-10 10:46:12 +11:00 |
|
Cheese
|
43f38c18ee
|
animation
|
2015-10-10 10:40:44 +11:00 |
|
Cheese
|
d99c64e45d
|
fixed merge error
|
2015-10-10 10:37:20 +11:00 |
|
Cheese
|
02c6eccfda
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/notifier/NotificationManager.java
|
2015-10-10 10:36:42 +11:00 |
|
Cheese
|
7dbd9da582
|
dragon sale Bar
|
2015-10-10 10:35:48 +11:00 |
|
Shaun Bennett
|
ba36ff565d
|
Merge remote-tracking branch 'origin/master'
|
2015-10-09 18:23:55 -04:00 |
|
Shaun Bennett
|
97ef4a4252
|
Pushing titan giveaway stuff for laptop
|
2015-10-09 18:23:47 -04:00 |
|
Jonathan Williams
|
586cc6e3e0
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-10-09 09:40:58 -06:00 |
|
Mysticate
|
ff1431b652
|
Fixed players glitching to chests before game starts.
|
2015-10-09 10:21:35 -04:00 |
|
Cheese
|
ff42e05a8d
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 14:20:58 +11:00 |
|
Cheese
|
99fd88473b
|
rank colors
|
2015-10-09 14:20:02 +11:00 |
|
Mysticate
|
fb4d08931c
|
Spider mount improvements.
|
2015-10-08 23:18:37 -04:00 |
|
Cheese
|
d9dd471db6
|
removed annoying debug
|
2015-10-09 14:04:12 +11:00 |
|
Cheese
|
c03c8163c5
|
fixed exploision stuff
|
2015-10-09 14:01:58 +11:00 |
|
Mysticate
|
90d0fcb36d
|
Merge branch 'Myst_HALLOWEEN' of http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into Myst_HALLOWEEN
|
2015-10-08 22:53:45 -04:00 |
|
Mysticate
|
598ea84e7a
|
Fixed explosions and cleaned up.
|
2015-10-08 22:52:57 -04:00 |
|
Cheese
|
d18353e592
|
Merge branch 'Myst_HALLOWEEN' of ssh://184.154.0.242:7999/min/Mineplex into Myst_HALLOWEEN
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
|
2015-10-09 13:44:41 +11:00 |
|
Cheese
|
41678eaf35
|
fixed scoreboard bug
|
2015-10-09 13:42:37 +11:00 |
|
Mysticate
|
1011c36c43
|
Fixed lobby being destroyed.
|
2015-10-08 22:41:45 -04:00 |
|
Mysticate
|
96f14f4fda
|
Fixed kit item names.
|
2015-10-08 22:31:20 -04:00 |
|
Mysticate
|
3802d47a37
|
Made the thing bold.
|
2015-10-08 22:29:22 -04:00 |
|
Mysticate
|
082b16fe0d
|
Stuff and things to help make mounts be cool.
|
2015-10-08 22:28:07 -04:00 |
|
Cheese
|
54c76c9d9c
|
fixed text
|
2015-10-09 12:27:30 +11:00 |
|
Cheese
|
a234fbce1e
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 12:17:57 +11:00 |
|
Mysticate
|
ed31bf9886
|
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
|
2015-10-08 21:16:24 -04:00 |
|
Mysticate
|
9254ca9162
|
K reverted + fixed bug
|
2015-10-08 21:12:38 -04:00 |
|
Cheese
|
24568a40f3
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 12:05:24 +11:00 |
|
Cheese
|
483ab13c2b
|
workaround for error where accountid is never set
|
2015-10-09 12:04:35 +11:00 |
|
Cheese
|
17ba04348d
|
stats debug
|
2015-10-09 11:53:08 +11:00 |
|
Mysticate
|
84cbee4535
|
Fixed it again
|
2015-10-08 20:52:17 -04:00 |
|
Mysticate
|
145832b326
|
Fixed mounts bc chiss is bad
|
2015-10-08 20:50:39 -04:00 |
|
Cheese
|
21dc0dc962
|
Merge branch 'Myst_HALLOWEEN'
|
2015-10-09 11:47:20 +11:00 |
|
Cheese
|
ec5694737c
|
statsmanager debug
rank fix
|
2015-10-09 11:44:12 +11:00 |
|
Mysticate
|
2cace7419f
|
Made Destructor sexi
|
2015-10-08 20:42:29 -04:00 |
|
Mysticate
|
92bab25a3f
|
Fixed Gust void stealing.
|
2015-10-08 20:38:33 -04:00 |
|
Mysticate
|
b8597d7161
|
Paintball stats.
|
2015-10-08 20:37:26 -04:00 |
|
Mysticate
|
cdb9741438
|
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
|
2015-10-08 20:36:16 -04:00 |
|