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
AlexTheCoder
88b4ac96e5
- Achievement stuff
2015-10-09 23:15:19 -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
xGamingDudex
ba171f95c6
Fixed UtilEnt.isGrounded for non-player entities.
...
Updated UtilEnt.isGrounded(Entity) to only apply custom handling of
players. Non-player entities now uses the default .isOnGround() check.
Implemented to fix entities like minecart which applies custom
is-on-ground checks.
2015-10-09 14:42:38 +02: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
