f54da4ee78
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-30 22:20:33 +00:00
396ce75087
Bug fixes/Additions:
...
- Being able to kill clan mates/create mode players who combat log.
- Added a notice that the player was killed, when a player logs back in after being killed when combat logging.
- Fixed Fall Damage making a player unsafe in safe territories.
- Fixed Alligator's Tooth damage.
- Fixed Alligator's Tooth working in lava.
- Added a UtilFile to Mineplex.Core.Common, for all stuff files!
2015-10-30 22:13:19 +00:00
301b8012ff
Final commit
2015-10-30 19:30:17 +13:00
ea1e4b79f7
Changes from SnD branch
2015-10-30 19:25:02 +13:00
ed18588a6a
Fix missing code and stuff
2015-10-30 19:12:04 +13:00
da0a99d662
Spawn facing fixes
2015-10-30 16:06:47 +13:00
50edf557ab
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-30 15:57:36 +13:00
388aa1611c
Update craftbukkit, add new vegetate head, fix maze, fix SG and UHC borders, fix gust, modify kits to use new vegetate
2015-10-30 15:44:37 +13:00
c4e93180fa
Merge branch 'master' into smash-champs-balance
2015-10-30 13:00:30 +11:00
401350e85d
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-29 13:14:33 -04:00
364d8b05af
Fix war invasion
2015-10-29 13:14:27 -04:00
e2947718fe
Remove code that wasnt meant to be commited
2015-10-29 13:10:10 -04:00
66a4b148e1
Fixed put on armour task being inconsistent.
2015-10-29 13:44:11 +00:00
0c5e34ad84
Finished the tutorial changes that I wanted to add. Added a few more events for shop stuff, to make the code a bit cleaner. Might continue the idea of more events in Clans. Added an optional argument to QAResetCommand which will allow you to reset to a specific task number. Quite useful when testing tasks that are one of the last ones!
2015-10-29 12:56:00 +00:00
7fca42b0e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
2015-10-29 21:41:59 +13:00
14df456b3d
Progres
2015-10-29 21:39:38 +13:00
d0bfb2e2e9
Finishing touches with UtilItem. Lots of changes to tutorials, and added a PlayerEnterTerritory event.
2015-10-29 08:35:24 +00:00
acc915c34e
Re-added my TurfForts patch, as well as fixed the "Game Changes to build time while spectating so you don't get your blocks" glitch.
2015-10-29 01:12:12 -04:00
8dd80094b4
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 1f0accd
2015-10-28 23:26:18 -04:00
9df297fc11
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
(cherry picked from commit 76e4dc6
2015-10-28 23:25:56 -04:00
a063da4cae
Renamed some things to comply with standards. Also moved some of the bit flags around, and moved them into seperate parts.
2015-10-28 22:55:10 +00:00
afadd61431
Added a few new item categories into UtilItem, and added the bitmasks to the materials belonging to said categories. Changed from using the 32bit int data type, to using the 64bit long data type, this should give me a bit more free space for more categories to put items in to, as I already ran out of space using a regular int.
2015-10-28 22:47:30 +00:00
cffcf245e9
UtilItem.java overhaul, complete item attribute system added.
2015-10-28 22:14:08 +00:00
8ce50d1fc7
Done most of the tutorial ghost mechanic, and also switched from using task's indexes for referencing the tasks, instead using names now. This should allow for much more flexibility, and adding/removing tasks will not be such a pain! (Having to switch all of the task indexes around for any code referencing tasks.)
2015-10-28 17:08:48 +00:00
765fb4ce11
Created the ClansShopItem enumeration, which has every item that can be sold in shops, with their buy and sell prices. All shops have been updated to reference this enumeration to get the prices for items.
...
Made it so that players that are "weaklings" will be stripped of their weakling title, if the sell value of their inventory is greater than 2000 Gold.
This mechanic uses the ClansShopItem enumeration, and is the main reason why it was created, since all prices were normally hardcoded into the shop page classes.
2015-10-28 07:34:13 +00:00
0486404c4b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2015-10-28 14:38:34 +13:00
5ec932d1ca
Fixing bugs
2015-10-28 14:36:48 +13:00
8d5b6e6d90
Don't show weakling particles above players that are not alive. Also removed debug message.
2015-10-27 10:18:14 +00:00
1938bcf799
Fixed the "weakling" status not updating correctly.
2015-10-27 10:01:33 +00:00
b4897e91fa
Fixed bug where an NPC's hologram would still stick around after the NPC is killed, since death and regular removal over time are handled separately.
2015-10-27 08:56:41 +00:00
234799e55e
Fixed infinite recursion in AlligatorsTooth.
...
Fixed a NullPointer exception in the Gear UI when you don't select an item type and you continue on.
Made a way to visually see the task you are on in the getting started tutorial, by making it dark cyan.
2015-10-27 08:32:21 +00:00
c30ece9d8b
Improved SafeLog to use the title system and holograms! Also removed knockback for NPCS
2015-10-26 19:48:20 +00:00
da058881f8
Some bug fixes in the gear ui, added the shine to rare item factory (I FORGOT TO COMMIT THE CLASS LAST COMMIT ARGH)
...
added alligators tooth particles & sound
added wind blade power feature
2015-10-26 15:37:44 +00:00
eb350a79c3
Added RareItemFactory (will add shine when lib helps me with it) and other small little fixes. Added a way to specify the amount of items in a single line in GearPage, so that armor and weapon type listings look more aesthetically pleasing.
2015-10-26 12:21:33 +00:00
63406e9ce1
Moved GearManager back to it's original package, and stopped using it in GearPage. Removed commented code from GearCommand, as the gui is now finished and it is not needed anymore.
2015-10-26 07:57:00 +00:00
7eab57c5dd
As per Chiss' request, made the gear ui go to next page when you choose an attribute.
2015-10-26 07:49:03 +00:00
cc2aae9726
Final touches to the gear gui, making it now completely finished. hooray!
2015-10-26 00:08:03 +00:00
327c129f46
Fixed the rest of merge conflicts (? [I hope {shaun help me ;-;}])
2015-10-25 12:28:12 +00:00
57da1d195a
- Resolved randomly using java 8 in this one plugin
2015-10-24 20:50:47 -04:00
08fd1b5790
- Fixed MPS Whitelist for usernames with non-lowercase characters
2015-10-24 20:49:09 -04:00
556d5adcd9
Change /global to /globalpacket (fixes conflict with announcement command)
2015-10-24 17:46:25 -04:00
1e4b3442fa
Conflicts:
...
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/FireGrenadeBase.java
2015-10-24 20:45:39 +01:00
63bc492f2c
Almost completely finished the /gear ui, still a few bugs and missing features, but it's getting there. Logging off now, don't want to lose code.
2015-10-24 20:36:53 +01:00
0d56eefd44
Titan/Rewards adjustments
2015-10-24 13:40:17 -04:00
089c4420b2
Lots of progress towards a /gear gui, not finished though. commiting now because I'm leaving and don't want to lose the code.
2015-10-24 07:16:13 +01:00
e3c824c512
Fix minor skywars error
2015-10-24 13:32:55 +13:00
4d2b359aad
Fix wolf cub strike
2015-10-24 08:41:10 +13:00
43cd0f86a9
Fix players unable to break blocks at spawn
2015-10-24 08:40:57 +13:00
7f025ad029
Fix CustomExplosion
2015-10-24 08:40:43 +13:00
40afcaf26b
Global Packet Commands
2015-10-23 15:07:53 -04:00
0c29805756
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-10-23 19:27:13 +01:00
11b836da8b
Added Join/Quit messages.
...
Removed periods from attribute descriptions.
Fixed legendary item lore having incorrect formatting.
2015-10-23 16:59:30 +01:00
2eb8b3e234
Catch PacketHandler exceptions
2015-10-24 02:17:19 +13:00
5ec4203fd9
More changes to disguise
2015-10-24 01:36:42 +13:00
a450b828b7
Fix disguises custom name
2015-10-24 00:48:54 +13:00
de9678a20f
Modify Craftbukkit
2015-10-23 21:28:01 +13:00
af208da953
Merge branch 'alex-testrank'
2015-10-23 18:10:59 +11:00
d9d0254e46
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-23 17:30:59 +11:00
fd1638a572
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-10-23 02:17:57 -04:00
5944b734be
More war fixes - still needs tweaking
2015-10-23 02:17:47 -04:00
e3e7dd4694
Titan rewards from mythical chests
2015-10-23 02:08:31 -04:00
4c381d41fe
Fixed second tutorial task misspelling, and added the first tutorial, which is /c help, as I completely forgot about it in the first place.
2015-10-23 06:10:09 +01:00
18d998fc04
Fixed colors cutting out in the middle of the message in task information, moar fireworks!
2015-10-23 05:56:53 +01:00
1512d87f9e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-23 00:28:32 -04:00
aedf04b3e3
Fix renaming pet not opening proper window
2015-10-23 09:26:21 +13:00
53aa1b655b
Remove custom formatter because it trims too short, don't need to commit it. Cleaned up CustomTagFix
2015-10-23 09:20:24 +13:00
8cde506a2c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-23 05:25:36 +13:00
ddb8d592f8
Remove all is1_8 checks
2015-10-22 18:37:14 +13:00
825b519890
Finalization of tutorials, made my code more consistent, and renamed any parts of code that referred to tasks as parts refer to them as "tasks."
...
Removed unused imports, and other code cleanup stuff.
Renamed EndTutorialCommand to SkipTutorialCommand as the actual command is "/skiptutorial" instaed of "/endtutorial"
2015-10-21 21:50:46 +01:00
e6bec41ca8
Fix "code too large" error.
2015-10-21 20:29:44 +01:00
bf406493e3
Fixed tutorial tasks that rely on territory entrances not working because formatting...
2015-10-21 20:14:35 +01:00
3cd803cda0
Update patch files and cb
2015-10-22 08:07:10 +13:00
00a689ea03
War work
2015-10-21 14:48:27 -04:00
112f34c77f
Fixed NullPointerException when clicking outside of inventory GUI.
2015-10-21 08:10:53 +01:00
5c010af8c4
Add updatehealth packet
2015-10-21 19:56:52 +13:00
c719d693dd
Added delete benefit call for repository.
...
Added failsafe in case inventory update didn't apply
Removed 43k benefit.
2015-10-21 01:15:09 -05:00
a5df50de92
On going map tutorials started and finished.
2015-10-21 06:55:06 +01:00
eb203131a7
Fixed import errors since I moved the getting started tutorial to a different package.
2015-10-21 06:19:23 +01:00
bd5266251b
Finalized the getting started tutorial.
...
Added the last 5 tasks, and added a nice big ending (fireworks)
Added an ugly fix to the QAResetCommand, which I am really unhappy about, but can't find any other way about it. It's only a test command though, so it'll be removed in the final releases.
2015-10-21 06:17:18 +01:00
c6cf47ee4e
I did not mean to commit that one line... Oh gosh that would have been bad... (addCoins onEnterTerritory). Was just for testing shops.
2015-10-21 04:36:47 +01:00
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
768ef4eb97
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-21 13:00:16 +11:00
8ceb69513a
Update patches and cb.jar
2015-10-21 05:05:27 +13:00
07f032a5d2
Fix wither pet making sounds, fixed worldtime.
2015-10-21 04:22:31 +13:00
ddd674e371
Packets implement Pcaket right
2015-10-20 17:19:46 +13:00
a2278297de
Created the base for tutorials, and created the getting started tutorial.
...
Have all the commands and most of the functionality in here now, but still need to do the scoreboard and some tweaking.
2015-10-19 17:16:48 +01:00
b3caf7c2d4
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
2015-10-20 04:38:12 +13:00
5d671d3300
Fix borders
2015-10-20 04:37:42 +13:00
3ef33bd9c5
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 01:32:23 -05:00
5e307da15a
Fix for inventory failure.
2015-10-19 01:32:12 -05:00
6d7f15cd6d
Fix hub time after light flicker
2015-10-18 18:52:16 -04:00
c7a5be9570
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-19 09:03:46 +11:00
55f97ef984
More fixes, along with a fix for Block Hunt
2015-10-19 06:21:16 +13:00
0a3f942575
Fix compile issue
2015-10-18 12:42:56 -04:00
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
9e7629b1fe
Added 43k player chest benefit.
...
Updated MOTD.
2015-10-18 00:21:01 -05:00
523378aae7
Clans War updates
2015-10-17 22:55:21 -04:00
d901cfa12c
buildies can join full
2015-10-18 10:54:34 +11:00
6f91827d57
Vector to Vector3f, updated Maze to 1.8
2015-10-18 12:40:01 +13:00
02bf202d52
1.8 update
2015-10-17 13:21:03 +13:00
589c05f8c0
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
2015-10-16 14:25:31 -04:00
3a0781b3c7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
2015-10-17 00:10:32 +13:00
14a524cf54
Stuff
2015-10-17 00:08:30 +13:00
41b6fdc74e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 21:47:35 +11:00
32489388c6
removed bug fix that caused SG break
2015-10-16 21:47:22 +11:00
f71cb80bd0
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
2015-10-16 22:26:07 +13:00
172bd65c57
Monster Maze motd.
2015-10-16 04:22:54 -05:00
70c76d976f
More changes
2015-10-16 22:10:13 +13:00
62b209fede
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-16 01:57:30 -05:00
d00fa856f3
Fixed Pets so they work correctly.
...
Also fixed legend benefits.
Fixed chest pet rewards.
2015-10-16 01:57:19 -05:00
016cea15f3
Merge branch 'Myst_HALLOWEEN'
2015-10-16 15:01:59 +11:00
b8eb924ffa
Fixed timing out. Yay. I'm done. G'night
2015-10-16 00:00:08 -04:00
577c67cacd
Merge branch 'Myst_HALLOWEEN'
2015-10-16 14:18:35 +11:00
b15b81a7e2
Spacing
2015-10-15 23:09:23 -04:00
f0a22d5c36
Fixed hammer throw
2015-10-15 23:02:51 -04:00
f0e0d41c42
Fixed two things.
2015-10-15 22:23:49 -04:00
6cc33fd6c6
Merge branch 'thanos-bug-fixes'
2015-10-16 12:53:43 +11:00
41511dce7b
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-15 21:19:24 -04:00
3dda9352e7
Progress
2015-10-16 13:32:23 +13:00
4205dc6c25
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java
2015-10-15 12:34:34 +13:00
98ec99cffc
Fix bug where players could retrieve teleport items out of the Travel Hub shop and later use them in their inventory. Implement a safe zone region of one chunk around all administrative clans (excluding Wilderness), to prevent players from building/claiming next to admin clans. Disable pistons throughout the server to prevent griefing. Fix left-over merge issue with donation manager.
2015-10-14 16:06:34 -04:00
1c52bd4f64
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-14 14:34:51 +11:00
86bad0be30
mods can check other players skills
2015-10-14 14:34:30 +11:00
0df637b80a
Run punishBot in main server thread
2015-10-13 22:56:14 -04:00
f683e932ae
Clans merge fixes
2015-10-13 22:24:15 -04:00
a049d7666f
Merge remote-tracking branch 'origin/master' into monster-maze
2015-10-13 22:14:19 -04:00
45cd2a38e1
admins can botspam
2015-10-14 11:55:59 +11:00
88709f85b6
Merge with master
2015-10-13 18:13:01 -04:00
cb0d82174e
Apply botspam to chat messages as well
2015-10-13 17:41:25 -04:00
1842eae7f0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 23:22:58 +11:00
d105ea5d7e
botspam addition
2015-10-13 23:19:48 +11:00
58a86c5abb
That's the easy stuff done..
2015-10-13 19:49:15 +13:00
a292fdb3c5
Added failsafe for ServerMonitor.
2015-10-12 22:26:24 -05:00
f5b80c941c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-13 11:58:27 +11:00
e8388437b6
botspam now checks for chat as well
2015-10-13 11:58:14 +11:00
3e5ac58ae9
helpers!
2015-10-13 11:23:00 +11:00
37639a413c
fixed skill stuff
2015-10-13 11:22:10 +11:00
be96842de5
Ultra
2015-10-12 17:02:34 -04:00
dceba51060
- Fix random blockhunt bug with mounts and infestor
2015-10-12 03:09:40 -04:00
bbb863ba92
- Merge conflict patch
2015-10-12 02:36:10 -04:00
2b9a66e7b2
more ssm update
2015-10-12 16:32:23 +11:00
1aecc9505c
Add region to titan, new MOTD
2015-10-12 01:30:31 -04:00
bef942f6da
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-testrank
2015-10-12 00:47:56 -04:00
6a173073a4
added flag to projectiles
...
work on cow kit
2015-10-12 14:39:14 +11:00
dab258dcdd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into MC_1.8
...
Conflicts:
Plugins/Libraries/BungeeCord.jar
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/TablistFix.java
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/PetTagPage.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Mineplex.Core/src/mineplex/core/packethandler/PacketHandler.java
Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
2015-10-12 16:22:52 +13:00
3eb36a6581
Prevented farming
2015-10-11 22:43:21 -04:00
2abf3edad4
Made items for titanic cosmetics dyes.
2015-10-11 22:29:26 -04:00
b6d573a4d5
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-11 22:25:25 -04:00
7a4ccdf680
Bug fixes
2015-10-11 22:17:34 -04:00
dda65b4c77
Fixed tnt exploding lobbies
2015-10-11 19:56:36 -04:00
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
606937d227
Fixed flashbang glitch
2015-10-11 09:42:36 -04:00
e6485a9009
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 23:02:36 -06:00
5866e0cce6
Reducing max connections for the DBPool to 3.
2015-10-10 23:02:08 -06:00
f23bf18928
adhering to mysts OCD
2015-10-11 14:50:57 +11:00
f3e2f3c145
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-11 14:48:17 +11:00
cb9e8f8e0b
pumpkin smasher achievement
2015-10-11 14:48:02 +11:00
435e74225a
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-10 23:35:33 -04:00
83d1e011fc
Changes.
2015-10-10 23:33:54 -04:00
998d5f6984
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 21:25:29 -06:00
061a7b7c73
Fixed Pet FK errors.
...
Added SUPPORT to acceptable updateRank command.
2015-10-10 21:24:47 -06:00
8b75664627
queued holiday transactions
2015-10-11 12:54:35 +11:00
6860fa608a
titan placeholder perks
...
art
fixed pumpkin gem count
2015-10-11 11:26:09 +11:00
72d943f51b
Restored skills to pre-eula ultra
2015-10-10 16:20:28 -04:00
5a8e500ec0
Fixed another thing
2015-10-10 16:15:10 -04:00
5e7ddb968e
Changes and bug fixes.
2015-10-10 15:54:18 -04:00
da6b1316d3
removed pumpkins from MPS
2015-10-10 22:47:19 +11:00
323842c693
fixed mods staying in flight
2015-10-10 19:36:38 +11:00
6f14c75f70
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-10 19:28:26 +11:00
6cf786eb8c
Merge branch 'Myst_HALLOWEEN'
2015-10-10 19:28:08 +11:00
1026a2ae22
fixed explosions
2015-10-10 19:27:54 +11:00
a242c6b592
Halloween Update finishes
2015-10-10 03:23:37 -04:00
e9207acd7f
Merge branch 'alex-halloween'
2015-10-10 17:38:09 +11:00
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
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
930cfa5cb8
DONE
2015-10-10 02:30:11 -04:00
f1e9acbb58
Titan giveaway
2015-10-10 02:19:05 -04:00
245a42c8e0
animation is sexi
2015-10-10 02:13:04 -04:00
30a9196430
Done with animation.
2015-10-10 01:43:31 -04:00
9a7357e484
Work
2015-10-10 01:00:49 -04:00
36fabf93b6
Merge remote-tracking branch 'origin/master'
2015-10-09 23:14:13 -04:00
bc7bf8a2e2
fixes/debug
2015-10-09 23:13:39 -04:00
512e08af19
Removed all create table statements.
2015-10-09 21:02:35 -06:00
1127764cc3
Secsi
2015-10-09 22:44:49 -04:00
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
aa9fd1abf3
Titan giveaway work
2015-10-09 22:14:10 -04:00
90c685617d
Animation
2015-10-09 22:14:01 -04:00
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
ed89f5f4cc
anim example for myst
2015-10-10 10:46:12 +11:00
43f38c18ee
animation
2015-10-10 10:40:44 +11:00
d99c64e45d
fixed merge error
2015-10-10 10:37:20 +11:00
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
7dbd9da582
dragon sale Bar
2015-10-10 10:35:48 +11:00
ba36ff565d
Merge remote-tracking branch 'origin/master'
2015-10-09 18:23:55 -04:00
97ef4a4252
Pushing titan giveaway stuff for laptop
2015-10-09 18:23:47 -04:00
586cc6e3e0
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-09 09:40:58 -06:00
ff1431b652
Fixed players glitching to chests before game starts.
2015-10-09 10:21:35 -04:00
ff42e05a8d
Merge branch 'Myst_HALLOWEEN'
2015-10-09 14:20:58 +11:00
99fd88473b
rank colors
2015-10-09 14:20:02 +11:00
fb4d08931c
Spider mount improvements.
2015-10-08 23:18:37 -04:00
d9dd471db6
removed annoying debug
2015-10-09 14:04:12 +11:00
c03c8163c5
fixed exploision stuff
2015-10-09 14:01:58 +11:00
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
598ea84e7a
Fixed explosions and cleaned up.
2015-10-08 22:52:57 -04:00
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
41678eaf35
fixed scoreboard bug
2015-10-09 13:42:37 +11:00
1011c36c43
Fixed lobby being destroyed.
2015-10-08 22:41:45 -04:00
96f14f4fda
Fixed kit item names.
2015-10-08 22:31:20 -04:00
3802d47a37
Made the thing bold.
2015-10-08 22:29:22 -04:00
082b16fe0d
Stuff and things to help make mounts be cool.
2015-10-08 22:28:07 -04:00
54c76c9d9c
fixed text
2015-10-09 12:27:30 +11:00
a234fbce1e
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:17:57 +11:00
ed31bf9886
Merge remote-tracking branch 'origin/master' into Myst_HALLOWEEN
2015-10-08 21:16:24 -04:00
9254ca9162
K reverted + fixed bug
2015-10-08 21:12:38 -04:00
24568a40f3
Merge branch 'Myst_HALLOWEEN'
2015-10-09 12:05:24 +11:00
483ab13c2b
workaround for error where accountid is never set
2015-10-09 12:04:35 +11:00
17ba04348d
stats debug
2015-10-09 11:53:08 +11:00
84cbee4535
Fixed it again
2015-10-08 20:52:17 -04:00
145832b326
Fixed mounts bc chiss is bad
2015-10-08 20:50:39 -04:00
21dc0dc962
Merge branch 'Myst_HALLOWEEN'
2015-10-09 11:47:20 +11:00
ec5694737c
statsmanager debug
...
rank fix
2015-10-09 11:44:12 +11:00
2cace7419f
Made Destructor sexi
2015-10-08 20:42:29 -04:00
92bab25a3f
Fixed Gust void stealing.
2015-10-08 20:38:33 -04:00
b8597d7161
Paintball stats.
2015-10-08 20:37:26 -04:00
cdb9741438
Changed the SG icon in hub, fixed EULA breaking thing in Class Shop
2015-10-08 20:36:16 -04:00
97d6f8fb42
Fixed placing walls in water.
2015-10-08 19:10:19 -04:00
8f826f6e83
Fixed blocks falling into floor in Build.
2015-10-08 19:04:51 -04:00
30e3c56635
Fixed ground issues in BUILD.
2015-10-08 18:58:30 -04:00
46bf963d44
Fixes not being able to reload dropped guns w/ 0 ammo.
2015-10-08 18:56:23 -04:00
979e68dcc7
Fixed the Minestrike multiple grenades bug.
2015-10-08 18:41:40 -04:00
ef62fb5adf
Made it so that when played on an MPS, HH won't give items. Yay!
2015-10-07 22:57:30 -04:00
8a8591ae7f
Merge branch 'master' of
...
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
Myst_HALLOWEEN
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/MountManager.java
2015-10-07 22:19:10 -04:00
668454f156
Fixed things
2015-10-07 22:10:57 -04:00
f2485854ef
Improved spider.
2015-10-07 22:06:57 -04:00
70f3ccf703
Fixed spider morph
2015-10-07 21:53:23 -04:00
e864e0867a
Adds mount spider and fixes a BH bug.
2015-10-07 21:47:10 -04:00
3c437925f1
halloween prep
2015-10-08 12:36:00 +11:00
191392825f
Merge branch 'Myst_EVO'
2015-10-08 12:07:21 +11:00
f28d83cbd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-08 12:05:51 +11:00
c94184c5ae
reduced number of falling blocks in skywars by 80%
...
added halloween horror mount
2015-10-08 12:04:28 +11:00
5378ece214
Fixed chicken being able to fly..
2015-10-06 21:09:53 -04:00
a0d0590777
Merge remote-tracking branch 'origin/master' into Myst_EVO
2015-10-06 21:04:49 -04:00
8fb82507e1
Merge remote-tracking branch 'origin/master'
2015-10-06 12:24:34 -04:00
9cb3f250e2
Remove streak record data until a better solution is done
2015-10-06 12:24:16 -04:00
e2e2356b04
stuffs
2015-10-06 13:25:15 +11:00
643f47763e
Improved consistency with the F5 message
2015-10-04 20:28:21 -04:00
0de34c15ab
NO more endercrystal go boom boom yay
2015-10-04 20:23:41 -04:00
9c1ba5f3d1
Changes on bomb error messages after QA recommendations.
2015-10-04 21:23:50 +03:00
0eeea58a01
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-10-04 11:50:20 -05:00
9f1c4653f4
Fix for Customer support item command with the removal of item categories.
2015-10-04 11:48:16 -05:00
NewGarbo
libraryaddict
Cheese
Shaun Bennett
Aaron Brock
AlexTheCoder
Shaun Bennett
William Burns
Jonathan Williams
Mysticate
Ty Sayers
Peter Miller
Thanos paravantis