Joseph Prezioso Jr.
59001bdef6
Fix merge-related errors
...
Fix, polish, and re-implement Elo code.
2016-04-07 16:40:30 -04:00
Keir Nellyer
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
c6c52885a9
Fixed commit
2016-04-05 15:16:40 -04:00
Ben
7f92a3c048
incognito changes
2016-04-05 00:38:27 +01:00
Shaun Bennett
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
Shaun Bennett
fecd3c1eaa
Final changes
2016-04-04 23:28:38 +10:00
Thanos paravantis
cc68b7087a
Change wool color on Wave Crush challenge
...
During map generation, the wool color is now predetermined and not
random.
2016-04-03 17:15:20 +03:00
Thanos paravantis
18ff9c23f7
Modify block removal from Wave Crush challenge
...
The removeExtraBlocks() method was changed, in order to include all
arena blocks. The previous version did not remove all extra blocks,
as it was using the getArenaSize() method inside the for-loop, which
returns a different integer depending on the challengers.
To fix that, I've implemented the '_arenaStartSize' field to store the
starting arena size value that is used in the map generation method.
2016-04-03 16:53:14 +03:00
Thanos paravantis
114fac2655
Refactor Red Light Green Light challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Moreover, a PlayerQuitEvent listener was added to remove players from
the '_cooldown' array list and a null check in the onEnd method, to
prevent any null pointer exceptions.
Also, there were some minor display changes, regarding titles and chat
messages on the moveTextAndSound() and cannotMoveTextAndSound() methods.
Lastly, the bedrock layer was removed from map generation.
2016-04-03 16:49:31 +03:00
Thanos paravantis
f454a6de81
Comment game classes and remove unnecessary checks
...
Added comments on game classes, except challenges
and statistics trackers.
Removed challenge validity checks from onCollide method in Anvil Dance
and Falling Blocks, since that is now handled on the Collide method
located in the main game class.
2016-04-02 22:49:56 +03:00
Thanos paravantis
12b90501e2
Refactor Wave Crush challenge
...
Separated functionality into different methods in order to improve
readability and maintainability. All four abstract methods were
updated, in order to make sure they work as intended without any
second thoughts.
Also, a new PlayerQuitEvent listener is added, in order to remove
players from the '_survivedWaves' hash map, which keeps track of
the waves every player survived.
Lastly, onCollide if-statement logic was reversed to reduce and
simplify the lines of code inside the method.
2016-04-02 22:10:43 +03:00
Cheese
9969b7d783
support for resource packs for different MC versions
2016-04-02 11:39:40 +11:00
Joseph Prezioso Jr
5e1003cccb
Missed a minus sign in my previous commit.
2016-03-31 14:06:45 -04:00
Joseph Prezioso Jr
6ccc6df6aa
Elo calculations now account for player's Elo, relative to the average Elo among players
2016-03-31 13:57:21 -04:00
Joseph Prezioso Jr
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
AlexTheCoder
4ae4f056ea
- Map Polish
2016-03-31 03:46:43 -04:00
AlexTheCoder
40175db217
- Lots of polish
2016-03-31 03:41:07 -04:00
Thanos paravantis
51820faceb
General bug fixes and minor changes.
2016-03-30 19:30:22 +03:00
Joseph Prezioso Jr
6048c97b52
Tweaks to clean/clarify things
2016-03-29 17:50:06 -04:00
Joseph Prezioso Jr
51cd770d38
Changes to help smooth the transition into using EloSettings.
2016-03-29 16:00:57 -04:00
Joseph Prezioso Jr
d8d952691b
cleaning up my code a bit
2016-03-28 13:40:34 -04:00
Joseph Prezioso Jr
abcdadc8d0
Corrected a small error in GameOption.
2016-03-28 12:40:41 -04:00
Thanos paravantis
cd08e5581a
Fix volley pig challenge, apply minor changes and bug fixes on Infestation, Reverse Tag.
2016-03-27 17:45:58 +03:00
AlexTheCoder
2530bc512e
- Fixed some more buggies
2016-03-26 14:02:18 -04:00
AlexTheCoder
bb28b7ad89
- Forgot to comment out 2 lines
2016-03-25 20:27:17 -04:00
AlexTheCoder
6678dffb61
- Updated everything for Sigils and chiss
2016-03-25 20:25:43 -04:00
Joseph Prezioso Jr
57a1e06406
no message
2016-03-25 20:11:35 -04:00
Joseph Prezioso Jr
f7575360db
Setting up a class to handle Materials as GameOptions
2016-03-25 16:42:39 -04:00
Joseph Prezioso Jr
05ede7910e
All errors have been fixed.
2016-03-25 15:27:11 -04:00
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
eb6c385936
More flags changed
2016-03-24 17:52:02 -04:00
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Joseph Prezioso Jr
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
Shaun Bennett
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
Shaun Bennett
a107c38f28
Comment out missing ring game kit so we can compile
2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c
Merge pull request #14 from Mineplex-LLC/Dual_1.9
...
1.9 Bugfixes + Ring game
2016-03-22 19:25:37 +11:00
Thanos paravantis
72994656dd
Improve dragon egg handling. Implement chat silence during challenge description.
2016-03-21 22:06:49 +02:00
Shaun Bennett
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
md_5
55e64a09b9
Test Gem Booster Item
2016-03-21 20:08:40 +11:00
md_5
0f83e302dd
Maintain game type boost queue across network.
2016-03-21 19:22:47 +11:00
Thanos paravantis
644e7a08bb
Bug fixes (detailed description below) and hit box improvements.
...
- Cancel teleport event to prevent the game from breaking.
- Block Lobbers: Fix falling block spawning and item drops.
- Color Change: Fix platform not spawning after first stage.
2016-03-20 23:26:55 +02:00
Jonathan Williams
750b960b46
Fixed references to snake events.
2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58
Moved snake events to their own classes.
...
Memory cleanup for Snake.
2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa
Fix with TurfForts infinite while loop.
2016-03-20 15:46:57 -05:00
Thanos paravantis
f57bd37116
Rush push, cloud fall and treasure digger updates/refactoring. Added /mark command to reveal and correct misplaced spawn locations.
2016-03-20 17:20:40 +02:00
Thanos paravantis
8084897782
Rush Push: Update custom damage event listener.
2016-03-20 12:14:09 +02:00
Thanos paravantis
c080bc31ab
Refactor rush push challenge, update win placement.
2016-03-20 11:10:16 +02:00
Jonathan Williams
3bc8dd0098
Fixed bug with infinite loop in Bridges MushroomSpawn.
2016-03-20 00:32:33 -05:00
Ben
723f62b8f9
incognito fixes and loads of other fixes
2016-03-20 01:06:46 +00:00
Thanos paravantis
1a51f51f60
Refactor color change, reverse tag and treasure digger challenge.
2016-03-19 17:36:27 +02:00
Thanos paravantis
115508cf72
Refactor onChallengeUpdate method.
2016-03-19 16:14:56 +02:00
Thanos paravantis
4c8292e7c9
Update color change and reverse tag challenge, changes and improvements and spawnpoints update.
2016-03-19 16:01:42 +02:00
Thanos paravantis
dd6d128b44
Rename files to match challenge name, change kit description, refactor color change challenge.
2016-03-18 18:36:32 +02:00
md_5
4899d56c09
Implement local gem boosters that can be activated on a joined arcade server.
2016-03-17 19:49:05 +11:00
AlexTheCoder
3212b75e4e
- Finally finished all of chiss' changes
2016-03-12 09:35:44 -05:00
Thanos paravantis
2f96325f0c
Challenge refactoring.
2016-03-12 11:16:37 +02:00
Ben
86c50cc3cd
updates
2016-03-11 19:03:32 +00:00
git
557b0bf978
Fix Wither disguise
2016-03-11 01:55:49 +13:00
Virizion
67e844db29
Added /e bridge <seconds> PC-17
2016-03-08 21:21:53 -05:00
Ben
5b3da3d06f
Consistency. (Changed Vanish to Incognito)
2016-03-09 01:53:01 +00:00
Virizion
6c0d18662f
Added /e clear <player or @a> PC-16
2016-03-08 20:45:23 -05:00
Ben
befb27d3db
Finalized Vanish system
2016-03-09 01:45:17 +00:00
Virizion
c89669aec9
Add /e announce <text> PC-15
2016-03-08 20:23:33 -05:00
Thanos paravantis
1ee7a42b9c
Challenge refactoring, modify challenge ending and chat messages, add generateGrass helper method.
2016-03-07 18:32:33 +02:00
git
496983ee04
Untested bugfixes
2016-03-07 22:29:14 +13:00
Thanos paravantis
4e6ba4ebd1
Challenge refactoring.
2016-03-06 16:45:25 +02:00
Thanos paravantis
c2d5699aa8
Challenge refactoring, bug fixes, add additional helper methods.
2016-03-06 00:59:13 +02:00
Thanos paravantis
0f58c1378c
Challenge refactoring.
2016-03-05 17:51:30 +02:00
Thanos paravantis
c30f6b0f96
Main class and challenge refactoring.
2016-03-05 17:06:07 +02:00
Shaun Bennett
d108679d43
Fix compile error
2016-03-04 14:09:20 -06:00
Thanos paravantis
51d4db5e46
Implement game settings and challenge list. Add isChallengeValid and isPlayerValid for event checks.
2016-03-04 20:01:08 +02:00
git
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
git
0ffa67dfb8
Ring game
2016-03-03 13:48:22 +13:00
Thanos paravantis
9e09d8c477
Challenge refactoring.
2016-03-02 22:54:47 +02:00
Keir Nellyer
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
Shaun Bennett
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
Thanos paravantis
9a4f4dbd7c
Merge branch 'master' into thanos-mineware
2016-03-02 18:47:30 +02:00
Thanos paravantis
60dfce4612
Challenge refactoring, move challenges to new package.
2016-03-02 18:45:27 +02:00
Shaun Bennett
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
Thanos paravantis
cb8b180c2f
Start challenge refactoring, implement helper methods.
2016-03-01 18:50:41 +02:00
Thanos paravantis
77871e3195
Implement challenge settings and data.
2016-03-01 17:09:43 +02:00
Thanos paravantis
6570adc4af
Improve zombie on infestation challenge.
2016-02-29 22:40:09 +02:00
Thanos paravantis
dd538dedd5
Fix Lava Run challenge map generation.
2016-02-29 20:19:26 +02:00
Thanos paravantis
6a2f66f722
Challenge bug fixes and refactoring.
2016-02-29 15:07:33 +02:00
Thanos paravantis
2bc396dc17
General bug fixes and improvements, add map height preference.
2016-02-28 18:15:37 +02:00
Thanos paravantis
bcb489f13d
Map support and parse locations. Minor changes and bug fixes.
2016-02-27 00:13:02 +02:00
Thanos paravantis
1e08e1a5db
Update player death handling, add aggressive chicken behavior, minor changes and refactoring.
2016-02-26 18:17:03 +02:00
Shaun Bennett
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
William Burns
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
Thanos paravantis
0e697e279b
Player death handling and chicken attack changes.
2016-02-25 23:35:38 +02:00
William Burns
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
William Burns
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
William Burns
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
William Burns
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
git
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
William Burns
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
William Burns
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
Thanos paravantis
1dbf7581d2
Add missing game class.
2016-02-24 21:45:38 +02:00
Thanos paravantis
27daace524
Rename game type to Bawk Bawk Battles, change item display to Egg.
2016-02-24 21:43:10 +02:00
Thanos paravantis
f2d58bd55c
Player death handling and chicken attack update, working version.
2016-02-24 20:13:23 +02:00
Thanos paravantis
a7fb1df539
Experimenting with player death and chicken attack.
2016-02-24 18:10:57 +02:00
William Burns
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
William Burns
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
William Burns
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
Thanos paravantis
6a234aa50f
Chicken attack and death handling progress.
2016-02-23 18:56:49 +02:00
Thanos paravantis
f1cb8378ac
Test commit
2016-02-23 14:54:12 +02:00
Keir Nellyer
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
AlexTheCoder
3b7a7e457c
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-20 03:20:27 -05:00
AlexTheCoder
0a6cdfa779
- chiss' requested changes
2016-02-20 03:18:59 -05:00
md_5
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
Shaun Bennett
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
md_5
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
libraryaddict
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
AlexTheCoder
d3884bd090
- Spawn regen
2016-02-17 22:12:23 -05:00
AlexTheCoder
fe849576f7
- Spawn protection
2016-02-17 22:04:20 -05:00
AlexTheCoder
4158c12227
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-17 21:44:51 -05:00
md_5
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
md_5
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
md_5
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
md_5
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
AlexTheCoder
9e2840b3b5
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-16 21:28:07 -05:00
AlexTheCoder
efb63ee824
- fixes
2016-02-16 21:27:50 -05:00
xGamingDudex
35b9e01aff
Added FlySpeed Cap to WitherAssault game
2016-02-16 19:26:00 +01:00
xGamingDudex
d10dc3d7be
Fixed NPE in KillsWhileEvolvingTracker for game Evolution
2016-02-16 19:22:18 +01:00
xGamingDudex
9c1e574f6a
Fixed ConcurrentModificationException in PerkDeadlyBones:99
2016-02-16 19:09:06 +01:00
xGamingDudex
2f302f4892
Fixed NPE for Gladiators death event
2016-02-16 18:54:13 +01:00
xGamingDudex
2436b7084a
Fixed some chat issues, especial one at GameChatManager:125
2016-02-16 18:52:18 +01:00
xGamingDudex
2d5868657a
Fixed NPE in PerkVanish
2016-02-16 18:35:42 +01:00
xGamingDudex
2d3956175b
Should have fixed PerkFishFlurry Block NPE on update (132)
2016-02-16 18:32:17 +01:00
xGamingDudex
ad6c506361
Concurrency Exception in PerkDeathsGrasp fix
2016-02-16 18:18:47 +01:00
xGamingDudex
d33905e174
Fixed NPE in MiscManager regarding hub clock tp fix for Master Builders
2016-02-16 18:09:07 +01:00
xGamingDudex
f551703d9c
SkyWars TNTGenerator NPE fix
2016-02-16 17:57:00 +01:00
AlexTheCoder
16c03ebb48
- Silly skeletons! Swimming is for players!
2016-02-15 21:54:18 -05:00
Shaun Bennett
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
AlexTheCoder
53ac1827bc
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-15 19:13:20 -05:00
AlexTheCoder
8d1b270089
- Balancing and bugs
2016-02-15 19:12:25 -05:00
Shaun Bennett
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
AlexTheCoder
f0d59755d2
- Update
2016-02-14 03:31:36 -05:00
AlexTheCoder
f6c38903f2
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into alex-compvanilla
2016-02-13 14:34:11 -05:00
AlexTheCoder
6385aacbac
- Updates
2016-02-13 14:28:39 -05:00
AlexTheCoder
138c900484
- Fixed up for more universal damage switching
2016-02-13 12:46:57 -05:00
AlexTheCoder
8b39d7ba43
- Void damage fix
2016-02-12 23:16:56 -05:00
AlexTheCoder
ea893bfa48
- Fixed update
2016-02-12 23:03:38 -05:00
AlexTheCoder
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
AlexTheCoder
9595a0ffae
- Lot of stuff
2016-02-12 21:22:00 -05:00
Shaun Bennett
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
Shaun Bennett
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
Shaun Bennett
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
Shaun Bennett
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
William Burns
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
William Burns
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
Cheese
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
Shaun Bennett
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
Shaun Bennett
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
Cheese
6800e4ef47
valentines final push
2016-02-09 20:43:24 +11:00
Virizion
51d152d484
Perfect build all fix
2016-02-07 19:05:53 -05:00
Virizion
aaf1fd42f3
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
2016-02-07 18:16:36 -05:00
Virizion
b40f018ee2
Stop mid game joiners from getting participation gems.
2016-02-07 17:20:58 -05:00
Virizion
e96b4c4a7f
Mob egg baby fix. Also fixed non build entities from being "broken"
2016-02-07 15:59:59 -05:00
Virizion
008fc587b0
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-07 15:33:37 -05:00
Virizion
7e9ff95ae3
spec command add guardian
2016-02-07 15:27:39 -05:00
Shaun Bennett
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
Shaun Bennett
c059425e9d
Remove GiveawayManager (not used anymore)
2016-02-07 13:18:29 -06:00
Mysticate
465f12e210
Fixed NPE
2016-02-07 13:27:38 -05:00
Cheese
2ab1b51401
bug fixes
2016-02-07 14:09:02 +11:00
Cheese
a35a9ea31f
more valentines :)
2016-02-07 13:27:53 +11:00
Virizion
2ac7840d71
The infamous look direction bounce bug
2016-02-04 23:54:54 -05:00
Virizion
b0b43524da
Chiss' double jump mechanic
2016-02-04 22:05:46 -05:00
Virizion
a76e570b8a
Moar fixes
2016-02-04 21:43:17 -05:00
Cheese
690c2acce8
many valentine, such wow
2016-02-05 13:25:57 +11:00
Mysticate
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
Cheese
5c22c841fe
val1
2016-02-04 10:55:29 +11:00
Shaun Bennett
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
Mysticate
af5cf309ca
Made sure that a valid tool is used before dropping any items.
2016-02-03 14:43:14 -05:00
Keir Nellyer
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
Thanos paravantis
854ebf70c4
Merge branch 'master' into thanos-mineware
...
Conflicts:
Plugins/Mineplex.Core/.classpath
Plugins/Mineplex.Queuer/.settings/org.eclipse.jdt.core.prefs
Plugins/Nautilus.Game.Arcade/.classpath
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.ui.prefs
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
2016-02-02 17:11:22 +02:00
Thanos paravantis
96cc73fcb7
Change challenge death handling, refatoring.
2016-02-02 17:07:04 +02:00
Virizion
41ea96d505
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-02-01 16:42:55 -05:00
Virizion
989c324a37
Hopper item pickup fix.
2016-02-01 16:18:40 -05:00
Thanos paravantis
de1ee4f6cb
Spectator and chicken attack changes.
2016-01-31 23:50:23 +02:00
Keir Nellyer
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
Mysticate
ace7d1764c
Fixed various ways of players going invisible through Spec mode.
2016-01-31 10:22:59 -05:00
Thanos paravantis
1f22883c13
Refactoring challenge selection and updating.
2016-01-31 16:57:54 +02:00
Thanos paravantis
0e1a14a0c3
Countdown modifications, refactoring, dogs vs cats challenge changes.
2016-01-30 21:52:18 +02:00
Thanos paravantis
69dc888657
Refactoring.
2016-01-30 21:07:00 +02:00
Thanos paravantis
215fe68575
Start code refactoring.
2016-01-30 17:19:33 +02:00
Thanos paravantis
e3a9f4f2f7
Chicken attack changes, refactoring, update map crumble variable access.
2016-01-30 14:14:55 +02:00
Shaun Bennett
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
Keir Nellyer
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
Thanos paravantis
c5a9f0c42c
Chicken attack bug fixes, death effect improvements.
2016-01-30 00:13:41 +02:00
Mysticate
b45e00796d
Fixed explosions dropping right items.
2016-01-29 15:58:49 -05:00
Shaun Bennett
1c3c800a66
Update fixes - @Teddy!
2016-01-29 14:05:09 -05:00
Thanos paravantis
0530ea28e7
Improve chicken attack, fix mini oitq arrow damage.
2016-01-29 19:15:37 +02:00
Mysticate
1e29bd6936
Made block define its own drops.
2016-01-29 11:44:40 -05:00
Mysticate
447583aa2a
Removed an nunnecesarry method
2016-01-29 09:41:45 -05:00
Mysticate
075a1141f1
Fixed items not dropping their regular counterpart.
2016-01-29 09:36:09 -05:00
Shaun Bennett
a1f9f41910
Merge remote-tracking branch 'origin/develop' into develop
2016-01-29 03:37:03 -05:00
Shaun Bennett
863be023d9
Prep for update
2016-01-29 03:36:52 -05:00
Shaun Bennett
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
Shaun Bennett
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
Shaun Bennett
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
Mysticate
caa5d922b5
Prevent hearts changing colors in UHC tab.
2016-01-28 22:54:20 -05:00
Mysticate
7d33e76055
Fixed ForTheKing achievement.
2016-01-28 22:51:19 -05:00
Mysticate
733ba067fe
Made sure Sniper achievement in Bridges is always fulfilled.
2016-01-28 22:49:51 -05:00
Mysticate
fffa1d5926
Fixed + Tidied Gladiators Precision achievement.
2016-01-28 22:48:52 -05:00
Mysticate
b92ddc7575
Added proper ore pickup delay.
2016-01-28 22:39:48 -05:00
Shaun Bennett
eb29c6b367
Fix constructor
2016-01-28 22:28:18 -05:00
Shaun Bennett
0177cf91bb
Merge with develop
2016-01-28 22:23:17 -05:00
Shaun Bennett
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
Shaun Bennett
051d70771b
Facebook Command
2016-01-28 22:15:35 -05:00
Shaun Bennett
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
Shaun Bennett
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
Shaun Bennett
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
Shaun Bennett
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
Virizion
b6db99806a
Remove debug message.
2016-01-28 18:28:43 -05:00
teddy
96ea001291
Clean up
2016-01-28 23:05:27 +00:00
teddy
da8a55f99c
Final edits
2016-01-28 22:57:54 +00:00
William Burns
75629055d8
Un-register HotbarEditor MiniPlugin and fix /spec bug.
2016-01-28 20:43:58 +00:00
Virizion
04544c2b8d
Fix flickering judge laser.
2016-01-28 14:28:47 -05:00
William Burns
d44d4c2278
Un-register the hotbar page listener on disable.
2016-01-28 19:21:42 +00:00
teddy
63cea58f05
Waiting for a testing session.
2016-01-28 17:18:24 +00:00
teddy
eed55b48ac
Descriptions changed
2016-01-28 09:55:48 +00:00
Keir Nellyer
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
Teddy
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
AlexTheCoder
b84ec01597
- Huge amount of stuff
2016-01-26 22:52:45 -05:00
Virizion
40113f99d3
Borders for spec are fixed.
2016-01-26 17:14:21 -05:00
Virizion
2f4146c243
Leaves fix.
2016-01-25 21:12:28 -05:00
Virizion
c5dfddd710
Fix dupe scoreboard entries. Make it so perfect builders can't fill or empty bucket.
2016-01-25 20:54:01 -05:00
Sarah
53132a248f
the L
2016-01-25 12:28:21 +01:00
Sarah
c7733bb068
Updateting spectator Menu layout.
2016-01-25 12:27:19 +01:00
Sarah
91b6ae8b09
fixing spec item in menu
2016-01-25 12:14:56 +01:00
Shaun Bennett
4314f35f80
Multiply by less
2016-01-25 04:46:47 -06:00
Shaun Bennett
b143ec7c19
negative!
2016-01-25 04:42:09 -06:00
Shaun Bennett
6ff7c83d3e
Trying different hologram location
2016-01-25 04:17:58 -06:00
Shaun Bennett
616be8aea7
Fix messages, fix /stats
2016-01-25 03:59:37 -06:00
Shaun Bennett
bc8f6e511c
Center hologram
2016-01-25 03:44:22 -06:00
Shaun Bennett
61f1a58b1c
hologram changes
2016-01-25 03:29:53 -06:00
Shaun Bennett
181cce4774
Holograms maybe?
2016-01-25 03:08:56 -06:00
Virizion
219b86ae55
Chiss' checklist.
2016-01-25 03:01:54 -05:00
Sarah
31ef7ffe19
Removing right clicking.
2016-01-25 07:45:38 +01:00
Sarah
f722831e6a
removing switching players until spigot patch is on.
2016-01-25 05:44:06 +01:00
Sarah
9e63c9000a
adding spectator rotation.
2016-01-25 04:30:42 +01:00
Virizion
bfe9aa7a59
Remove unnecessary tabs. Make the judge guardian use it's own laser again.
2016-01-24 21:55:57 -05:00
Virizion
0eda813d41
Fixed builds with only mobs not loading.
2016-01-24 19:14:34 -05:00
Sarah
00f01e09af
adding entity spectating by right clicking and right clicking head in compass menu.
2016-01-24 20:00:05 +01:00
Thanos paravantis
72fb2317b9
Update team creation and winner placement, fix NPE on Veteran Tracker.
2016-01-23 14:31:36 +02:00
Virizion
a747426fa0
Fixed mobs.
2016-01-23 05:00:14 -05:00
Virizion
a359c4f8b6
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-23 03:42:50 -05:00
Virizion
1e732b08e7
TICK TICK TICK TICK.
2016-01-23 03:42:36 -05:00
Cheese
790e2e8f73
Merge branch 'virizion_speed_builder' of ssh://184.154.0.242:7999/min/Mineplex into virizion_speed_builder
2016-01-23 19:32:37 +11:00
Cheese
c1ff7f4fc2
all players equal, no one loses
2016-01-23 19:32:23 +11:00
Virizion
a75770b0a6
Change build to load from top instead of bottom.
2016-01-23 03:15:41 -05:00
Shaun Bennett
f82a408f30
Build time modifiers
2016-01-23 02:43:41 -05:00
Virizion
5dc773032b
Add joining players to guardians team instead of spectator.
2016-01-23 02:10:11 -05:00
Virizion
245cc1ed93
Limit Perfectionist achievement to 1.
2016-01-22 22:18:29 -05:00
Shaun Bennett
311d42db30
Use Garbo's description changes
2016-01-22 19:48:06 -05:00
Shaun Bennett
231b8cb19a
Merge pull request #133 in MIN/mineplex from bugfix/foo to develop
...
* commit '376f719c261bd2152a6646a152472a2485e1b689':
fixes important bug, fixed a scary typo!
Lots of typo fixes and such
i before e!
fixed cosmetic menu item dropping bug
more grammatical errors hast been fixed
Grammatical errors hath been fixed!
2016-01-22 18:38:26 -06:00
Shaun Bennett
b2e4dff9e5
Add time to perfect build message
2016-01-22 19:18:23 -05:00
Shaun Bennett
02b45bd302
Forgot to register stat tracker
2016-01-22 19:14:25 -05:00
Shaun Bennett
ddc86f0897
Add Speediest Builderizer achievement
2016-01-22 19:13:23 -05:00
Shaun Bennett
d0e5be9c93
Guardian is impressed (untested!)
2016-01-22 18:35:18 -05:00
Thanos paravantis
a74d4fa960
Working on chicken attack when a player looses all of his lives.
2016-01-22 23:59:29 +02:00
Virizion
3f715ab4dd
Enable inventory click.
2016-01-22 02:23:58 -05:00
Shaun Bennett
4bbd956e14
Don't use the same build twice (untested!)
2016-01-22 01:37:47 -05:00
Shaun Bennett
49e439af55
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-22 01:28:09 -05:00
Shaun Bennett
6bb60ddebd
Ignore empty builds (untested!)
2016-01-22 01:27:29 -05:00
Virizion
c66f37817e
Fixed invis bug.
2016-01-22 01:22:31 -05:00
Virizion
5c83f5c1e5
Renamed to Speed Builders from Speed Builder.
2016-01-22 00:20:58 -05:00
Virizion
0da921f3d2
Removed debug thing.
2016-01-21 23:52:59 -05:00
Virizion
a38319147a
Stopped physics which fixed the torch bug.
2016-01-21 23:49:49 -05:00
Shaun Bennett
582fa4c915
Merge remote-tracking branch 'origin/virizion_speed_builder' into virizion_speed_builder
2016-01-21 22:42:33 -05:00
Shaun Bennett
c38596a09f
Name the guardian, 10 seconds to view builds
2016-01-21 22:42:25 -05:00
Virizion
24e97176cc
Call clear build area method on eliminate.
2016-01-21 22:05:30 -05:00
Virizion
d37b8b40fc
Disable item merge to (hopefully) fix phantom rails.
2016-01-21 20:41:28 -05:00
Virizion
50c9b33701
Merge branch 'virizion_speed_builder' of ssh://dev.mineplex.com:7999/min/mineplex into virizion_speed_builder
2016-01-21 20:13:53 -05:00
Virizion
636da8f4fa
Mob destroying. Removed a debug change that only selected builds with mobs in them.
2016-01-21 20:13:32 -05:00
Cheese
5675aed698
velocity the drops to the player
2016-01-22 11:56:52 +11:00
Virizion
69825893c9
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2016-01-21 19:11:36 -05:00
Virizion
6ab6307f74
Pushing all my stuff for Shaunpai.
2016-01-21 19:08:38 -05:00
Thanos paravantis
44de231c7d
Start implementing chicken attack on player death.
2016-01-21 21:35:14 +02:00
Teddy
1e72ebcbe6
Merge branch 'master' into rankdescriptions
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-01-21 12:54:12 +00:00
Keir Nellyer
dd0fc23467
Merge branches 'feature/report' and 'master' of ssh://dev.mineplex.com:7999/min/mineplex into feature/report
2016-01-21 10:12:02 +00:00
Shaun Bennett
c0d4fa1bea
Merge pull request #125 in MIN/mineplex from bugfix/mb-wins to develop
...
* commit '4924d652f555392c9e36feb05a64cccd61b6c594':
Store winner UUID instead of Player object to avoid leaking excess data
Fixed who the winner is in MB Games.
2016-01-20 12:33:56 -06:00
Shaun Bennett
4924d652f5
Store winner UUID instead of Player object to avoid leaking excess data
2016-01-20 13:33:40 -05:00
Teddy
573d0dd67d
Stats added for all other games
2016-01-19 23:10:45 +00:00
William Burns
7af8d78fc3
Add resource pack and other fixes
2016-01-19 14:00:23 +00:00
Shaun Bennett
951c27123a
Remove /disguise for YOUTUBE_SMALL in arcade
2016-01-18 22:10:01 -05:00
Teddy
c52bc8024c
Halloween, added kit to stats
2016-01-18 11:41:30 +00:00
Teddy
740eeae9bd
Halloween, added stats
2016-01-18 11:40:46 +00:00
Teddy
3fc25359be
Gravity, added stats
2016-01-18 11:38:43 +00:00