b7099088a9
Merge remote-tracking branch 'origin/develop' into project-cosmetics
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/block/schematic/Schematic.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguisePlayer.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/MiscManager.java
2016-04-23 00:55:48 +02:00
2a4c3209b4
- Enable ELO
2016-04-22 05:44:56 -04:00
70541fd6f2
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla
2016-04-22 05:41:24 -04:00
d73b720323
Merge branch 'features/elo' into develop
2016-04-22 04:34:35 -05:00
477acf044e
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
2016-04-22 04:34:21 -05:00
7b18efa7b0
Prevent farming elo up with multiple games by dc and joining new game.
2016-04-22 04:05:07 -05:00
ddd1c5af9b
Removed EloSettings and fixed scoreboard.
2016-04-22 03:10:09 -05:00
34f94c0381
Reverted scoreboard because of MC maxlines turd nugget.
2016-04-22 02:55:27 -05:00
4577cf0398
Fixed scoreboard :D
2016-04-22 02:47:48 -05:00
7cc4811ede
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into features/elo
2016-04-22 02:39:35 -05:00
f922be51fe
Scoreboard tweak.
2016-04-22 02:39:08 -05:00
04fe30df43
- Fix sb
2016-04-22 03:38:20 -04:00
03bdc8d2db
Merge branch 'features/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-22 03:17:54 -04:00
b69a75355c
Fixed scoreboard alignment.
2016-04-22 02:17:40 -05:00
1d3ad3c5fd
- Enabled ELO for testing
2016-04-22 02:06:37 -04:00
44d4255628
Added endElo in the appropriate spots.
2016-04-22 00:58:07 -05:00
6d00e8b41f
Refactored Elo to work correctly.
2016-04-22 00:21:11 -05:00
d0e3b094c1
- cleaned up and prepped for live update
2016-04-21 20:57:35 -04:00
e55bec505b
- Fix players ending up teleported back to arena due to broken respawn engine
2016-04-21 20:13:39 -04:00
df55d48ab8
- Looks better
2016-04-21 01:03:14 -04:00
d57cc48f0f
- Added new features!
2016-04-20 22:31:54 -04:00
f86b18b603
Elo Works Now
...
Ready to move on to MCL implementation
2016-04-20 22:09:18 -04:00
2d02d79cec
Fix survival games' Beastmaster wolf spawning
...
Beastmaster wolf spawning suffered from the same issue as the Wizards
"Summon Wolves" spell: spigot has an issue when setting an owner to a
wolf or ocelot without a previous owner. See SpigotUtil for details.
2016-04-20 18:45:54 -05:00
2d45ab61cc
Elo re-calculated
...
Elo is now being incremented more consistently (and not multiple times)
2016-04-20 15:48:27 -04:00
6a5c8336cf
Elo and Division fixed
...
Elo and Division should be displaying properly
Cleaned the code up a bit
Added endElo() to Game.java to handle team Elo code
Added event listener to check for GameState.End in TDM to call endElo()
2016-04-20 14:52:06 -04:00
bda9772ba6
Mitigate spigot issue when setting wolf owner
...
This fixes the Summon Wolves spell in Wizards.
Explanation:
- Wolves keep track of their most recent owner.
- When a wolf is assigned a new owner, it updates the data
watcher with the new owner's UUID
- During this process, the old owner's UUID is checked
against the new one
- If the wolf didn't have a previous owner, the old owner's
UUID is the empty string.
- UUID.fromString() is called on the empty string, and throws
an exception.
2016-04-19 02:46:38 -05:00
6dc2559dd1
Merge remote-tracking branch 'remotes/origin/md_5/boosters' into feature/gems
2016-04-19 13:57:33 +10:00
e08965aa25
- Fixed TowerDefender being too difficult to obtain
...
- Fixed wither attacking own towers by accident
2016-04-18 22:58:55 -04:00
6c20427395
- Fixed some bugs and added final achievements
2016-04-18 22:32:15 -04:00
17ac3cb597
- Fix armor checking
...
- Edit wither death message
2016-04-18 20:29:53 -04:00
10aba533f3
- Remove all dependence on UtilShapes
2016-04-18 19:59:55 -04:00
34399db6e8
- Fixed missing GameType
2016-04-18 18:42:56 -04:00
e45f800519
Fixed damage calculator error
2016-04-18 20:36:22 +02:00
9de990744d
Stage
2016-04-18 17:46:38 +10:00
ee30012011
Merge branch 'feature/elo' of github.com:Mineplex-LLC/Minecraft-PC into alex/elofix
2016-04-17 12:27:23 -04:00
d623d0982b
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into alex-compvanilla-merge
2016-04-17 12:02:08 -04:00
4c35e35fc0
- More polish and bugfixes
2016-04-16 23:59:44 -04:00
9c2cd6a883
Merge branch 'feature/redis-update' into feature/gems
2016-04-17 13:08:11 +10:00
35d7dd8b44
- Fixed stuff
2016-04-16 20:36:19 -04:00
b0d30a4ff4
- cleaned everything up
...
- renamed game
2016-04-16 20:32:14 -04:00
d8f5ac66fc
- More chiss
2016-04-16 14:05:46 -04:00
696088b57e
Fixed gun stats between games
2016-04-16 18:16:53 +02:00
bbb81dd663
Elo calls migrated to Game.java
...
Consequently, elo code is actually being called now
Bukkit.broadcastMessage calls have shown where things are breaking
handleElo() added to EloManager to facilitate movement of team elo code
preparing to use EloManager's getNewRatings() method to
calculate team elos
2016-04-15 20:48:56 -04:00
ffc0459e5a
Cosmetic Update
...
+ Support for relative copy position from with //copy from worledit in
schematics
+ Better block selection in bounding box in UtilBlock
+ Goal selector utils for entities
+ Global hide and show methods for players
+ Win effects and game modifiers
+ Tweaked player disguises
+ Added clean room generator to arcade games, previously normal flat
world
+ Animation utils
* Edited some particles, hats and death animations
2016-04-16 02:24:41 +02:00
2b2b251548
Merge branch 'clans/beta' into develop
2016-04-15 12:41:14 -05:00
09f9ae3b7a
- Update for playability
2016-04-14 23:05:14 -04:00
33b557eb10
- Huuuuuuuge amount of changes for chiss
2016-04-14 22:45:21 -04:00
742807d80e
Added generatePlayerElos and updated saveDivision
...
Added method to fill EloManager's playerElos hashmap with values
--This may not work as intended
--Currently only implemented in Team Death Match
2016-04-14 17:17:26 -04:00
6b2f601c7a
Prevent a spectator race condition in arcade games
...
Previously, a player would erratically become a spectator if s/he
spammed the "spectate next player" action between rounds (i.e.
left-click while spectating a player).
2016-04-13 18:20:39 -05:00
9e8a7b582b
Elo updates
...
EloRanking turned on for Domination, Team Deathmatch, Turf Wars, CTF
Database QoL changes made to EloManager and EloRepository
--Unfortunately, Database still seems to not be updating properly
--Something on my end, or something to do with the queries? Unsure.
2016-04-13 18:35:56 -04:00
a04f7c23c6
Disable incognito for staff in hub invisibility, and vice-versa
2016-04-08 20:18:56 +01:00
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
390b2878dc
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-04-07 14:28:30 +01:00
91e550bdcc
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into develop
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/outpost/Outpost.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/weapon/SiegeWeapon.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/FinishCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/command/TutorialCommand.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java
2016-04-06 19:40:01 -04:00
a07e71ba08
GameOption takes a generic value to eliminate the need for more than the one GameOption class.
...
Remove the--now unnecessary--classes that inherited from GameOption.
Consequently, the creation and implementation of GameOptions should be much more efficient.
Note: it may be necessary to add decimal points to doubles and to cast 'long' data types as 'long'.
The above note generally applies to numerical values, but may apply to other values, as well.
2016-04-06 18:10:31 -04:00
f030f78f08
Add headers to new classes, so as to comply with coding standards.
...
To that end, change methods to camel case and refactor them, so that the newly-renamed methods do not result in errors.
2016-04-06 16:20:26 -04:00
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
ff929a8515
Merge remote-tracking branch 'remotes/origin/develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
2016-04-05 00:57:28 +10:00
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
cbb9798c35
Added AdjustPlayertElo method to increment/decrement the Elo's of individual players at the end of a game. Currently calling the new method in AnnounceEnd.
2016-03-31 12:49:22 -04:00
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
57a1e06406
no message
2016-03-25 20:11:35 -04:00
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
262c6c2fa6
Quick Lunch-time bug-squashing update. Still have tons of errors to go through, but I want to make sure everything is backed up, should the weather turn foul(er) and a power outage should occur
2016-03-25 13:53:20 -04:00
c1ef185e82
Flags have been changed and I have started to get rid of the errors that have started cropping up.
2016-03-25 12:48:39 -04:00
667ec03f06
Still a few more flags to go. I'll get to them tomorrow. Hopefully, I'll also figure out where/if I need to change things elsewhere in the code.
2016-03-24 18:43:02 -04:00
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
0246ec275e
More flags have been changed to use the new Game Options. WHY IS NOTHING BREAKING!? Not that I'm complaining. Just really confused...
2016-03-24 17:47:07 -04:00
b5d3a6b8c3
Small fix to last commit so that everything works while I continue working on getting GameOptions working
2016-03-24 16:34:16 -04:00
4e02258124
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/commands/ClansCommand.java
2016-03-24 16:32:33 -04:00
e8dcc4a3e2
Merge branch 'develop' into clans/beta
...
# Conflicts:
# Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
# Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
# Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-03-23 11:02:20 +11:00
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
61b79fab9d
Merge pull request #13 from Mineplex-LLC/PC-15
...
Fix PC-13, PC-15, PC-16, PC-17
2016-03-21 20:31:58 +11:00
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
4899d56c09
Implement local gem boosters that can be activated on a joined arcade server.
2016-03-17 19:49:05 +11:00
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
6d0ca4f813
Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2016-03-03 13:49:31 +13:00
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
b18f2d8682
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
2016-03-02 20:02:09 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
33bf3e2e6e
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
2016-02-24 08:03:42 +00:00
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
99150db2d7
Merge branches 'feature/report' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/report/ReportRepository.java
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
2016-02-22 19:02:54 +00:00
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
0a6cdfa779
- chiss' requested changes
2016-02-20 03:18:59 -05:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
d3884bd090
- Spawn regen
2016-02-17 22:12:23 -05:00
fe849576f7
- Spawn protection
2016-02-17 22:04:20 -05:00
4158c12227
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-17 21:44:51 -05:00
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
efb63ee824
- fixes
2016-02-16 21:27:50 -05:00
35b9e01aff
Added FlySpeed Cap to WitherAssault game
2016-02-16 19:26:00 +01:00
d10dc3d7be
Fixed NPE in KillsWhileEvolvingTracker for game Evolution
2016-02-16 19:22:18 +01:00
9c1e574f6a
Fixed ConcurrentModificationException in PerkDeadlyBones:99
2016-02-16 19:09:06 +01:00
2f302f4892
Fixed NPE for Gladiators death event
2016-02-16 18:54:13 +01:00
2436b7084a
Fixed some chat issues, especial one at GameChatManager:125
2016-02-16 18:52:18 +01:00
2d5868657a
Fixed NPE in PerkVanish
2016-02-16 18:35:42 +01:00
2d3956175b
Should have fixed PerkFishFlurry Block NPE on update (132)
2016-02-16 18:32:17 +01:00
ad6c506361
Concurrency Exception in PerkDeathsGrasp fix
2016-02-16 18:18:47 +01:00
d33905e174
Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders
2016-02-16 18:09:07 +01:00
f551703d9c
SkyWars TNTGenerator NPE fix
2016-02-16 17:57:00 +01:00
16c03ebb48
- Silly skeletons! Swimming is for players!
2016-02-15 21:54:18 -05:00
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
53ac1827bc
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-15 19:13:20 -05:00
8d1b270089
- Balancing and bugs
2016-02-15 19:12:25 -05:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
f0d59755d2
- Update
2016-02-14 03:31:36 -05:00
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
6385aacbac
- Updates
2016-02-13 14:28:39 -05:00
138c900484
- Fixed up for more universal damage switching
2016-02-13 12:46:57 -05:00
8b39d7ba43
- Void damage fix
2016-02-12 23:16:56 -05:00
ea893bfa48
- Fixed update
2016-02-12 23:03:38 -05:00
197bcc9dbf
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
2016-02-12 21:23:58 -05:00
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
e3ff25526b
Merge pull request #164 in MIN/mineplex from valentines/game to develop
...
* commit '6800e4ef478e2d1eea5c19ec52a8368ec0bd520a':
valentines final push
bug fixes
more valentines :)
many valentine, such wow
val1
2016-02-09 20:28:58 -06:00
f6e091f029
Merge pull request #163 in MIN/mineplex from feature/valentines-cosmetics to develop
...
* commit '57638ff68496b6f10012f8782633066b52a8a715':
More work on valentines
Valentines gifts
Added love potion and hub sheep thing.
Started on Love Potion system. Switching branches.
Varius tweaks and changes.
Added sheep mount to index.
Added various cosmetic items for Valentines day.
2016-02-09 20:28:37 -06:00
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
a5c5a7c536
Merge pull request #157 in MIN/mineplex from bugfix/bridges-ore-mining to develop
...
* commit '465f12e210120e316e9252dc4e5b7207b4ae0279':
Fixed NPE
Made sure that a valid tool is used before dropping any items.
2016-02-07 14:00:46 -06:00
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
c0d6cbbb85
Added various cosmetic items for Valentines day.
...
- Heart arrow trail
- Heart death animation
- Heart double jump animation
- Heart set
- Cupid's bow gadget
- Pink Sheep mount
2016-02-04 13:12:53 -05:00
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
699a26f630
Merge pull request #159 in MIN/mineplex from master to feature/dmt-update
...
* commit '70d41b074f9256b4ac0b6fb51b68fb24dcf10e24': (328 commits)
Fix treasure stair orientation
add a shard queue to DonationManager, use that for TreasureShardReward
mac fix
Commons codec is not included in BungeeCord.
Pooling with later jedis versions doesn't work on Bungee.
Gitignore redundant Eclipse files.
Add Eclipse magic.
Fixed various ways of players going invisible through Spec mode.
Speed up LobbyBalancer to 500ms
Add example maven settings.xml
Remove setTestOnBorrow
Tone down lobby balancer too.
Emergency patch to slow down redis player count updates.
Fixed explosions dropping right items.
sapling fix
Update fixes - @Teddy!
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
Final changes
...
2016-02-03 16:06:59 -06:00
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
27fc81dd8b
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-02-03 17:23:40 +00:00
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
9601eabfeb
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
2016-01-31 17:38:08 +00:00
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
52b6779a4f
Merge pull request #146 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b45e00796d66cf8aeb39510e0bd23bc5bd59327b':
Fixed explosions dropping right items.
Made block define its own drops.
Removed an nunnecesarry method
Fixed items not dropping their regular counterpart.
2016-01-30 01:45:00 -06:00
8cf32ef8bf
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-30 00:46:43 +00:00
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
ba0dd3da44
Merge pull request #141 in MIN/mineplex from bugfix/bridges-ore-stealing to develop
...
* commit 'b92ddc75759bc848b409b5626f0fbeb9d71154b5':
Added proper ore pickup delay.
2016-01-29 02:33:23 -06:00
a0e9a82327
Merge pull request #143 in MIN/mineplex from bugfix/achievements-misc to develop
...
* commit '7d33e76055eb160e58d63443a72117e654df9468':
Fixed ForTheKing achievement.
Made sure Sniper achievement in Bridges is always fulfilled.
Fixed + Tidied Gladiators Precision achievement.
2016-01-29 02:32:50 -06:00
63fa942789
Merge pull request #144 in MIN/mineplex from bugfix/uhc-hearts to develop
...
* commit 'caa5d922b520da30223230b58754a77dd3b72186':
Prevent hearts changing colors in UHC tab.
2016-01-29 02:27:20 -06:00
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
40f6969413
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-01-28 22:16:15 -05:00
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
251fb53f29
Merge pull request #124 in MIN/mineplex from bugfix/morph to develop
...
* commit '2e433d8b0654507a9a41d9bbae313ab90e92471f':
Made sure that the active morph gets disabled on clear
2016-01-28 21:08:32 -06:00
bf273708f9
Merge pull request #136 in MIN/mineplex from feature/entity-spectating to develop
...
* commit '53132a248f9d899e2b4b275a31cfd69376533688':
the L
Updateting spectator Menu layout.
fixing spec item in menu
Removing right clicking.
removing switching players until spigot patch is on.
adding spectator rotation.
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-28 21:08:13 -06:00
015cca57b6
Merge pull request #138 in MIN/mineplex from bugfix/gladiators-hotbar-editor to develop
...
* commit '75629055d851265e91eb7d0679a40a1357552e17':
Un-register HotbarEditor MiniPlugin and fix /spec bug.
Un-register the hotbar page listener on disable.
2016-01-28 21:03:48 -06:00
f72ee95759
Merge pull request #139 in MIN/mineplex from virizion_speed_builder to develop
...
* commit 'b6db99806ab171774ffd9c9db11cf361ad76dc94': (83 commits)
Remove debug message.
Fix flickering judge laser.
Borders for spec are fixed.
Leaves fix.
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
Make dependable require 50 perfect builds instead of 10.
Multiply by less
negative!
Trying different hologram location
Fix messages, fix /stats
Center hologram
Make achievement category classics
hologram changes
Holograms maybe?
Chiss' checklist.
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
Fixed builds with only mobs not loading.
Fixed mobs.
TICK TICK TICK TICK.
all players equal, no one loses
...
2016-01-28 21:02:23 -06:00
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
ac37417fca
Merge branches 'develop' and 'feature/report' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/.idea/modules.xml
2016-01-27 21:44:04 +00:00
70be135a40
Merge branch 'feature/hoverable-chat' of http://dev.mineplex.com:7990/scm/min/mineplex into rankdescriptions
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/typewars/TypeWars.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameChatManager.java
2016-01-27 19:42:11 +00:00
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
53132a248f
the L
2016-01-25 12:28:21 +01:00
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
xGamingDudex
AlexTheCoder
Jonathan Williams
Joseph Prezioso Jr.
cnr
Shaun Bennett
md_5
Ben
Keir Nellyer
Shaun Bennett
Cheese
Shaun Bennett
git
Virizion
William Burns
Keir Nellyer
Mysticate
teddy
Sarah