NewGarbo
227e9f7bfc
Pretty much finished with tutorials, not fully though, but I am simply pushing so I don't lose all my work.
...
CHANGES----
Added a little hack to ScoreboardElement.java that allows for a single element to clear the currently existing scoreboard lines output, or modify it.
Coded in the functionality of 7 tasks, will do the rest now.
2015-10-21 04:27:14 +01:00
Shaun Bennett
177e482dbc
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2015-10-18 12:35:31 -04:00
Shaun Bennett
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
Shaun Bennett
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
Shaun Bennett
cb0d82174e
Apply botspam to chat messages as well
2015-10-13 17:41:25 -04:00
Shaun Bennett
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -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
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
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
Cheese
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +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
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
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
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
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
Cheese
ff42e05a8d
Merge branch 'Myst_HALLOWEEN'
2015-10-09 14:20:58 +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
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
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
