d3c9957f95
Ultimate length tweaks
2016-07-23 23:43:06 +01:00
43aae5e076
Ultimate visual and gameplay improvements
2016-07-22 22:47:29 +01:00
c5f3f2b2d6
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-21 22:44:43 +01:00
b87c6cfff0
Fix git removing class
2016-07-21 17:27:41 -04:00
75cc75f40c
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 17:25:15 -04:00
4a77a587f8
Fix git removing a class
2016-07-21 16:11:05 -04:00
fc3ceddf4d
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-07-21 15:47:59 -04:00
0262452b6a
Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable.
2016-07-21 13:59:35 -05:00
9b58c53e90
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-21 16:11:09 +01:00
faece2c5f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-21 11:13:15 +01:00
f48009d9f8
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq
2016-07-21 11:12:23 +01:00
e7658b4bf2
New kits and upgrades for old kits
2016-07-21 11:05:21 +01:00
e5cd38c11b
Revert enjin changes
2016-07-21 05:20:47 -04:00
2615ef74dd
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/clans
2016-07-21 05:09:54 -04:00
b48f97fd2e
Fix stupid JOOQ issue and IntelliJ.
2016-07-21 03:46:18 -05:00
9a06cce0a0
Merge branch 'feature/party-v2' into develop
2016-07-20 16:41:50 -05:00
67a185acc9
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-20 15:52:59 -05:00
ff210271c9
Add javadocs
2016-07-20 12:21:15 -04:00
7e26480452
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-19 22:29:00 +01:00
3411a3b978
Throwable Dirt colliding issues
...
Fixes the falling dirt block colliding with the thrower.
2016-07-19 22:28:56 +01:00
8b552a69de
Removal of debug message
2016-07-19 21:45:03 +01:00
765958a421
Code cleanup for PerkDirtCannon
...
Cleans up some bad code in PerkDirtCannon and now removes the dirt
blocks on death.
2016-07-19 20:51:14 +01:00
7470078da9
Typo in PerkFireBurst
...
Should say Blaze Rod instead of Snowblock
2016-07-19 20:50:19 +01:00
588e32e1b1
Addition knockback perk for Earth Kit
...
Adds a perk so that the Earth kit takes 75% less knockback while on the
ground
2016-07-19 20:49:27 +01:00
0390822fd7
IceBridge item no longer droppable
2016-07-19 20:48:36 +01:00
63a0eebd02
Increased chance enchanted of armour
2016-07-19 20:48:12 +01:00
0eac157701
Implement basketball features in the hub and begin setting up coordinates
2016-07-19 12:45:38 -04:00
5ecfaef413
Merge branch 'feature/mavericks-master-builders' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-07-18 16:28:22 -04:00
103f31afc1
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-18 17:17:11 +01:00
370b0693d9
fix the server thinking it's the next week
2016-07-17 05:20:21 -05:00
0ae4b0c5e0
Temporarily disable anti-xray in UHC
2016-07-16 23:08:18 -05:00
08850d909f
Further work on brood mother boss and nether
2016-07-16 21:59:03 -04:00
e2af4df44b
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-16 21:22:57 +01:00
34f718b2ec
Fix improper gem/shard reward handling
2016-07-16 06:27:16 -05:00
30111eb940
Duplicate enchantment fix
2016-07-16 11:16:57 +01:00
951e07488a
GI changes from testing session
2016-07-16 11:15:33 +01:00
f012e8d4ed
Merge from develop
2016-07-16 08:41:15 +01:00
8523d56bbf
Merge fix
2016-07-16 08:33:41 +01:00
6756d04aa7
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-15 23:56:08 +01:00
d901fce3ac
Experimental Skywars Kits
2016-07-15 23:07:17 +01:00
728a91da0f
adding damage outsid ethe loop
2016-07-15 04:57:44 +02:00
3070835662
enable armor protection and fix shotguns
2016-07-15 04:39:53 +02:00
6c7f2d8b0d
fix damage in DM prepare, eating grenades and no health regen
2016-07-15 02:28:22 +02:00
f0c2686ca7
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-14 23:01:11 +01:00
a0847b8d1a
Fix null ServerGroup uptimes value for MPSes
2016-07-14 08:08:24 -05:00
1a2e0df6ca
Only allow OPs to use minestrike debug commands
2016-07-14 07:28:33 -05:00
1d1c3ef1be
Merge branch 'thanos-mineware' into develop
2016-07-14 03:41:00 -05:00
40345bc93c
Fix Bawk Bawk Battles game start
2016-07-14 11:23:39 +03:00
7cc44c8bfc
Merge branch 'thanos-mineware' into develop
2016-07-14 00:22:01 -05:00
906762e9db
Remove debug commands
2016-07-14 08:17:36 +03:00
917b83250d
Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
...
This reverts commit 30287a0832b8650d741d
2016-07-14 00:10:37 -05:00
7dcf7378ef
Many changes
...
Fix spectator race condition
Refactor out cut clean into modules
Add combat log module
Add antixray module
2016-07-13 21:30:54 -05:00
a7b30f4f59
Merge branch 'thanos-mineware' into develop
2016-07-13 21:26:25 -05:00
a34ac42093
Amplifiers adjustment - shards only
2016-07-13 19:26:23 -05:00
4e985b85e6
Make final challenge changes
...
- Increase Color Change delay
- Make Tag Master not count for players jumping into the void
2016-07-13 23:59:01 +03:00
369dabffae
Amplifier updates - move to boost shards only
2016-07-13 15:07:24 -05:00
711a04ffa8
Add Bawk Bawk Battles to hub compass
2016-07-13 21:40:31 +03:00
3497a4c095
Remove unused debug messages
2016-07-13 19:29:48 +03:00
6c11b718af
Remove suppress warnings annotations
2016-07-13 19:03:39 +03:00
dab3e09837
Achievement fixes, minor challenge changes
...
- Fishing Day was marked as deprecated.
- Surf Up will no longer track waves in which players were killed.
- Make Bouncing Shadow not count players that lost.
- Tag Master will now select alive players only.
- Removed debug messages.
2016-07-13 18:52:14 +03:00
ad32f4e2f1
Remove unnecessary new string declaration
2016-07-13 18:05:35 +03:00
839d9263fd
Prevent game crash if started with one player
2016-07-13 18:03:38 +03:00
efce89a7e7
Fix Color Change platforms not removed properly
2016-07-13 17:47:17 +03:00
2e5d7c023f
Fix Tag Master, show bouncing block full score
2016-07-13 17:13:02 +03:00
6cef42d7a4
Fix merge issues
2016-07-13 13:36:59 +03:00
179b59af2c
Merge branch 'develop' into thanos-mineware
2016-07-13 13:28:03 +03:00
943dc88ca4
Modify challenge list, change display messages
2016-07-13 13:23:15 +03:00
e40abd4859
Merge branch 'thanos-mineware' into develop
2016-07-13 05:04:50 -05:00
2f6e140b34
Item in hand change (Devourer)
...
Changes the item in the NPC's hand for Devourer from OBSIDIAN to a
DIAMOND_CHESTPLATE
2016-07-12 21:57:37 +01:00
5382afedda
Sharpshooter arrow limit changed to 4
2016-07-12 21:56:25 +01:00
654ab281ea
Add option of "uptimes" to servergroups
2016-07-12 15:44:29 -05:00
0f3b2da8b7
Fix Bouncing Block, re-add features for testing
2016-07-12 23:02:01 +03:00
daddaa477e
Merge branch 'update/brawl-games' into develop
2016-07-12 06:45:32 -05:00
9cf5a6fb9e
Fix Absorption in OP MB, add more arrows to OP MB, fix not being able to purchase primary weapon in MS, fix skin bug in MS and fix helmet drop when scoping in Strike Games
2016-07-12 05:39:21 +02:00
ac8a920484
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/brawl-games
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/GunModule.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/guns/Gun.java
2016-07-12 03:07:31 +02:00
30287a0832
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
2016-07-11 14:46:08 -04:00
f40299e402
Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised
2016-07-11 18:34:48 +01:00
6a87be13f0
Remove features that contain bugs
2016-07-11 01:02:19 +03:00
416b978c4f
Apply chicken attack and completion improvements
...
- Chicken spectators will no longer receive the compass to prevent
them from teleporting near players.
- The winner of the game will not see the
"You have completed the challenge." message
as the game will end afterwards.
2016-07-10 15:16:17 +03:00
5a7e7c7623
Challenge bug fixes and improvements
...
- Added crumble feature to Block Lobbers
- Increased TNT height on Water Horror
- Increased Lava Run difficulty
- Fixed unclickable Bawk's Food Kit
- Fixed chickens not attacking properly on chicken attack
- Fixed dominant team not winning on team based challenges
- Fixed spectators being able to break blocks on Treasure Digger
2016-07-10 13:32:24 +03:00
a9f41ab269
Refactor project classes
2016-07-09 12:00:06 +03:00
5c83f09456
SnapshotRepository no longer extends MinecraftRepository
...
It doesn't need to.
2016-07-08 23:26:33 -04:00
34565b2975
PC-699
...
/bc in MPS is now protected by the filter
2016-07-08 22:09:48 +01:00
07b65ad1c9
PC-621
...
Doors can now be opened in Block Hunt
2016-07-08 21:01:15 +01:00
af9611dcfd
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple
2016-07-08 21:00:34 +01:00
331c1bcf91
Merge branch 'develop' into thanos-mineware
2016-07-08 22:29:59 +03:00
7887c96cc9
Decrease delay between challenges
2016-07-08 22:28:53 +03:00
7ba7414101
Improvements, refactoring and bug fixes
...
- Fixed heights not being calculated correctly on Kangaroo Jump.
- Fixed platform not being removed entirely on Color Change (needs confirmation).
- Fixed death effect items not spawning on Treasure Digger.
- Fixed TNT not reaching players on Water Horror.
- Fixed Dogs Vs Cats hologram being displayed continuously (flashing) (needs confirmation).
- Increased score hologram elevation rate.
- Spawn locations are automatically centered.
- Border is now far away from challenges.
- Refactored main game class.
2016-07-08 21:30:43 +03:00
ce72d25832
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-08 13:09:02 -05:00
42c578be9d
PC-612
...
Fixes an issue that removing Co-host from someone would remove their
creative mode in Master Builders.
2016-07-08 17:54:42 +01:00
c16f9ec9ec
PC-688
...
Changes the description in Draw My Thing so that it reflects changes
made to the tip system.
2016-07-08 17:53:22 +01:00
c607654c51
PC-692
...
Fixes an issue that allowed staff spectators to damage the King in
Castle Siege
2016-07-08 17:50:33 +01:00
7940eeb0ee
PC-633
...
Allows humans in Wither Assault to place blocks under the map, allowing
them to no longer get stuck
2016-07-08 17:49:38 +01:00
aae24d862a
Revert "PC-692"
...
This reverts commit 7865b1ef80
2016-07-08 17:38:53 +01:00
7865b1ef80
PC-692
...
Allows humans in Wither Assault to place blocks anywhere so that players
are not able to get stuck in the ground
2016-07-08 17:37:32 +01:00
5349d26115
Merge branch 'develop' of ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into feature/mavericks-master-builders
2016-07-08 03:41:13 +02:00
d276d8ca5d
Removed "Failure" feature and cleaned some code
2016-07-08 03:40:37 +02:00
c50ec49ad9
Minor updates
...
Tweaked some location values.
Added more event handling to the reveiw hub and mavericks hub.
Added builder info holograms to all sides of the display slots in the
mavericks hub.
2016-07-08 02:59:33 +02:00
cb555a41ab
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-07-07 20:47:19 -04:00
0dc17bf6fa
Further code cleanup
2016-07-07 18:12:52 -04:00
da9ad913b2
Finalisation of update
2016-07-07 23:03:23 +01:00
4e0287ad03
Re-import report feature classes in Hub and Arcade
2016-07-07 14:01:18 -04:00
783b20a0dc
Disable champions abilities in smash dom and disable supply chests, adjust peace announcement in Strike games, Absorbtion fix in OP MB, Countdown in CHanging Kits, more Arrows in OP MB, regen hunger in skysmash, scoped players drop helmets now, fix stuff with identifiers in GunModule
2016-07-07 15:08:57 +02:00
63b6158fe4
More UHC Fixes
...
Fixes:
PC-137
PC-138
PC-497
PC-665
PC-710
PC-719
PC-754
Also fixes chunk synchronization issue, plugs potential memory leaks
Fancy spectating
Use enum priorities
2016-07-06 15:55:12 -04:00
17f89f6937
Merge branch 'project-cosmetics' into develop
2016-07-06 13:00:29 -05:00
04f0ef199c
Make CustomFirework singleton class public
2016-07-06 20:47:28 +03:00
63500c19c9
Removed commented lines
...
Added javadocs to GadgetChangeEvent
2016-07-06 14:45:05 -03:00
989dd98212
Fix players not losing on Pick a Side
2016-07-06 20:41:26 +03:00
6a66d6cc92
Lower barrier spawn chance on Cloud Fall
2016-07-06 20:40:51 +03:00
7319965c45
Temporarily fix challenge completion/lose issues
2016-07-06 20:40:15 +03:00
47f62e2c89
Make lava run a bit more difficult
2016-07-06 20:39:37 +03:00
36285ee101
Improve GunModule with editable variables
2016-07-06 18:55:13 +02:00
4dedd27227
finish up editing of arrays for gamemodes
2016-07-06 18:34:15 +02:00
185ba600ca
Merge branch 'develop' into thanos-mineware
2016-07-06 17:48:31 +03:00
e326fd322c
Update Pick a Side, refactor Reverse Tag
2016-07-06 17:45:51 +03:00
29434b786e
Apply completion/lost bug fixes
2016-07-06 17:45:22 +03:00
3e77ce0f00
make arrays parseable by variables
2016-07-06 14:03:41 +02:00
a430f7e94d
Add chat messages for Peace Phase, remove arrows from chests, disable crafting, fix dropped pumpkins and disable weapon enchantments
2016-07-06 13:45:31 +02:00
ab4174cfb9
Refactor Red Light, Green Light and Volley Pig
2016-07-06 12:04:04 +03:00
e0d133ab67
Broadcast a message when timer runs out
2016-07-06 11:10:57 +03:00
de74716abf
Refactor Treasure Digger and Volley Pig
2016-07-06 11:10:21 +03:00
ae60d05bbb
Refactor Wave Crush
2016-07-06 10:25:20 +03:00
b40346417a
Remove unused project files
2016-07-06 10:25:05 +03:00
67adb34311
Fixes for the WinRooms
...
Removed Freedom Chests from the menu
2016-07-06 00:00:50 -03:00
eccd7deedc
Fix merge errors and properly force disable particles by checking the game's settings
2016-07-05 17:25:01 -04:00
607b92984e
Fix hologram elevation speed
2016-07-05 23:18:29 +03:00
9f58e57a67
Bug fixes.
2016-07-05 14:35:37 -05:00
00c3584c0b
Make score holograms elevate faster
2016-07-05 21:14:13 +03:00
6a8c30d496
Refactor Mini OITQ and Water Horror
2016-07-05 21:13:49 +03:00
071f0c4de7
Refactor Ore Run and Rush Push
2016-07-05 19:39:30 +03:00
f36244efc6
Refactor Lava Run and Milk a Cow
2016-07-05 19:27:59 +03:00
108031acf1
Refactor Kangaroo Jump and King of the Ladder
2016-07-05 18:53:53 +03:00
f64234e4d1
Refactor Falling Blocks and Fast Food
2016-07-05 18:14:31 +03:00
c0680b3511
Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint
...
Numerous Bug fixes
2016-07-05 10:01:58 -05:00
ba02c94e08
Refactor Dogs Vs Cats and Egg Smash
2016-07-05 17:00:38 +03:00
5d01bc2863
Refactor Deadly TNT and Diamond Hunt
2016-07-05 16:30:51 +03:00
fe89a0f094
Refactor Cloud Fall and Color Change
2016-07-05 16:17:19 +03:00
361e857bc7
Refactor Build Race and Chicken Shooting
2016-07-05 15:54:43 +03:00
3f13c5f518
Refactor Block Lobbers and Bouncing Block
2016-07-05 14:52:25 +03:00
4789f640b2
Refactor Anvil Dance and Arrow Rampage challenges
2016-07-05 13:57:05 +03:00
ce3117ba4b
Fix anvils staying on map after challenge end
2016-07-05 13:03:42 +03:00
9f45c0a622
Use offset2d instead of offset
2016-07-05 13:03:02 +03:00
9cec81ee34
Define border after challenge is started.
...
Previously, the border was defined in the challenge constructor,
as a result the boundaries were not set correctly. That's because
the map center on each challenge is defined in the constructor, and
since the super one is called before the challenge constructor, the map
center which defines part of the border was not correct.
2016-07-05 12:35:27 +03:00
dd55d96ccf
Delay glass removal when obsidian is far away
...
On Lava Run, when obsidian is generated far away from the last
created obsidian block, a delay of 1 second will be added to the
total delay until the platform is removed, because normally glass
is removed very quick.
2016-07-05 12:32:44 +03:00
295711d626
PC-632
...
Fixes an issue where going under the map in Wither Assault would cause
you to have negative speed and not be able to move
2016-07-04 20:31:59 +01:00
d393ffcc51
Update debug commands for Sr.Mods
2016-07-04 22:06:01 +03:00
4397784f35
Add new challenge completion effect
2016-07-04 22:05:34 +03:00
06feb615a9
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-07-04 04:18:01 -05:00
5644589b10
PC-541
...
Covers all possible eventualities of redstone ore and glowing redstone
ore
2016-07-03 20:57:58 +01:00
e96f7f1217
PC-508
...
Fixes a hit box issue with Rocket Slimes
2016-07-03 15:58:54 +01:00
bdc049efe1
PC-508
...
Fixed an NPE with Inferno
2016-07-03 15:58:19 +01:00
26361eaee0
PC-508
...
Fixes certain abilities in Team SSM that could be used to
damage/knockback other team members
2016-07-02 13:38:22 +01:00
8d8824446d
PC-519
...
Fixes an issue where grenades would not do damage after you die.
2016-07-02 12:12:15 +01:00
5e994e37da
Fix Monster Maze jumping mechanics (Fixes PC-711 and PC-634)
2016-07-01 16:37:03 -05:00
e2663d6448
Move spawn related methods to challenge classes
2016-07-01 17:18:03 +03:00
6fdbda0ed0
Refactor Dogs Vs Cats challenge
2016-07-01 17:04:06 +03:00
8101fced7b
Detect correct volley pig block and fix its spawn
2016-07-01 13:58:21 +03:00
568cbb2672
Prevent infinite spawn search loops by /mark cmd
2016-07-01 12:32:31 +03:00
7379b2069b
Make volley pig map size and spawns dynamic
2016-07-01 12:31:41 +03:00
baca63dcae
Merge branch 'develop' into thanos-mineware
2016-07-01 11:43:56 +03:00
f6d882fcb4
Disallow placing throwing tnt
2016-06-30 21:12:12 -05:00
c442376ccc
Oops
2016-06-30 22:04:34 -04:00
005189c2d4
Edit kit items in OITQ to fix bow instant charge glitch (Fixes PC-203)
2016-06-30 17:41:09 -05:00
b0303a8870
Create new equations for Protection Enchantment functionality to make it work properly (Further fix for PC-311)
2016-06-30 17:41:09 -05:00
37e50df948
Make kits ensure association with players using them (Fixes PC-588)
2016-06-30 17:41:09 -05:00
36bb0b9ae8
Force player visibility to refresh in games over a steady rate (Fixes PC-497)
2016-06-30 17:41:09 -05:00
3e1c44bfa3
UHC improvements
...
Lots of hacky NMS stuff. Ask me if you're confused
Basically, decorate the world async
Keep spawn chunks loaded
Make sure view distance is capped so no chunks are genned on teleport
Add regeneration and resistance on spawn to prevent damage
Set health objective score manually
Teleport player two times to ensure no block glitching
Disable kicking and NCP while teleporting
2016-06-30 17:15:01 -05:00
6d9e84b817
Merge branch 'develop' of
...
ssh://git@github.com/Mineplex-LLC/Minecraft-PC.git into
feature/mavericks-master-builders
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/F.java
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilBlock.java
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
2016-06-30 23:08:31 +02:00
03511a7234
Updated values
...
Updated teleport mav world value to fit new version of the map.
Split themes of multiple words to new lines.
Fixed bug where 16+ long lines on scoreboard would get random colors.
Seem to have forgotten to include the MavWorldManager earlier... ups.
2016-06-30 22:56:26 +02:00
40124b2cdd
Updated changed method name (getThrower)
...
In the ProjectileData class GetThrower was changed to getThrower, this
fixes that in any of my classes
2016-06-30 17:19:53 +01:00
69bd4006d4
Merge remote-tracking branch 'refs/remotes/origin/develop' into bugfix/mopple-sprint
2016-06-30 17:14:38 +01:00
e25a6e4327
Reset leap data when needed (death/quit/game end)
2016-06-30 05:18:39 -05:00
5c60819179
Prevent NPE on player interact event
2016-06-30 05:18:39 -05:00
f9208b67ef
Added schematic support for ground in MB.
...
Also fixed an NPE and moved a constructor to protected.
2016-06-29 15:19:46 +02:00
880ac6b88f
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
2016-06-29 06:21:18 +02:00
32ee27d9ee
Small bugfixes with QA
...
Never re-show reviewed builds in review-server.
Toggle debug messages in review-server.
Fixed minor bugs with QA
2016-06-29 03:49:53 +02:00
9d8eb1f044
ArcadeManager doing .zip check, but not acting upon it
2016-06-29 03:46:58 +02:00
04cb0fb0b0
Use updated ProjectileUser method names
2016-06-28 23:09:52 +03:00
4436ba0710
Merge branch 'develop' into thanos-mineware
2016-06-28 23:05:11 +03:00
c5c08562c3
Merge branch 'master' into thanos-mineware
2016-06-28 23:01:42 +03:00
42ebb95db1
Fix NPE on zombie infection
2016-06-28 21:57:32 +03:00
973666a42f
Improve challenge selection system
...
- Game will no longer end unexpectedly, when all challenges are played.
- Challenges are now marked correctly as played.
2016-06-28 21:57:17 +03:00
5e9f16424c
Add shouldDie method, update zombie wrapper name
2016-06-28 20:38:32 +03:00
43f375fd86
Reset team data on team challenges
2016-06-28 20:37:26 +03:00
eea980b354
Apply smoother knockback on volley pig
2016-06-28 18:41:50 +03:00
c5367d4510
Remove double plants entire from spawn locations
2016-06-28 12:15:49 +03:00
cf434b92de
Modify punch the pig description
2016-06-28 11:47:47 +03:00
dc250d4bf2
Store locations after game start (fix NPE)
2016-06-28 11:47:25 +03:00
7218dc710f
Retrieve scoreboard data only when possible
2016-06-28 11:46:38 +03:00
8ad63ef7ea
Tweaked some code to better fitt schematics.
2016-06-28 06:29:44 +02:00
cd5555c3f9
Fixed invis entities after pasting blocks + removed debug code
2016-06-28 04:03:40 +02:00
beeddfedd4
Force the ball to drop if the carrier is AFK
2016-06-27 21:07:44 -04:00
a69101bef3
Cleaned out some debug messages and added some java-docs.
2016-06-28 01:35:37 +02:00
65e05b9d8c
Small polish on Mavericks Master Builders
2016-06-28 01:13:34 +02:00
5b32eb4815
Update to Kit Progression system
2016-06-27 18:47:15 -04:00
119931ac71
Remove unneeded Data Loc
2016-06-27 18:33:01 -04:00
ab315627ad
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into update/basketball-game
2016-06-27 17:45:36 -04:00
d6672c44f4
Finalized the hub module and finished local testing
...
Cleaned up some source. Applied some small updates. Finished local
testing.
2016-06-27 00:34:17 +02:00
dbf0bf35b4
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-26 23:00:19 +01:00
90df695624
Merge branches 'feature/report-v2' and 'master' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-26 00:18:07 +01:00
c966620808
Change resourcepack links
2016-06-25 19:52:22 +02:00
fbd9b17ba0
fix playeringametime being 0
2016-06-25 12:35:59 -05:00
8d4f5f0f93
Modularize Minestrike and add Strike Games
2016-06-25 19:11:08 +02:00
a714144159
Implement new challenge selection system
...
The new challenge selection system stores only one instance of each
challenge, instead of creating new ones when the next challenge is
selected. In addition to that, challenge data is now reset every time
the challenge ends to be able to reuse the same resources.
In a future commit, I might as well only generate the spawnpoints once
in an attempt to make things as quick as possible. The new system may have
some bugs, since it's not fully tested with QA yet.
2016-06-25 13:19:09 +03:00
bc229c44aa
Apply small changes to Zombie Infection
2016-06-25 11:56:55 +03:00
7a55b131d4
Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep
2016-06-25 09:11:42 +02:00
b34d652617
Add Lucky Bridges, CookieFight and OP MB
2016-06-25 06:35:08 +02:00
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
285d94a2ca
Fill hotbar editor with glass panes
2016-06-25 04:48:59 +02:00
323d865b57
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-06-24 18:13:51 +01:00
0cda8ab7a3
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 04:11:59 -05:00
8fbb06ae3d
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
2016-06-24 04:11:38 -05:00
14542d7dac
Close open UIs except for Champions kits
2016-06-24 04:10:08 -05:00
c40e07695c
Only close open UIs when choosing SSM kits
2016-06-24 04:06:28 -05:00
560abc933c
Replace underscores with spaces in booster group
2016-06-24 03:16:42 -05:00
b58ff8c066
Add YouTube and Twitter buttons to UI
2016-06-24 01:30:10 -05:00
fd843b88cb
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/inventory/GemBooster.java
# Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
# Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java
2016-06-23 23:02:26 -07:00
a9f291338f
Amplifiers GM Candidate
2016-06-23 22:49:12 -07:00
eeaf9fa49a
Fix chat in arcade
2016-06-23 23:24:50 -05:00
3433e0e3bc
Merge branch 'project-cosmetics' into develop
2016-06-23 18:42:47 -05:00
e09df7ccfd
fix chests being opened by specs
2016-06-23 16:46:54 -05:00
399ab5c363
fix supply chest protection, absorbtion effect, tnt and level bugs
2016-06-23 16:46:45 -05:00
f8080d2663
PC-574
...
Another fix for the minestrike vanish problem, this one fixes staff
being assigned teams on join.
2016-06-23 22:40:15 +01:00
c1b7be6363
Fix merge problems
2016-06-23 16:33:20 -03:00
7749314e64
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-23 16:11:49 -03:00
a441727e09
Freedom update:
...
Freedom chests
Freedom Aura
Shock and Awe
Leap of Freedom
Price of Freedom
Uncle Sam Morph
Freedom Mount
Uncle Sam Hat
Persistence update:
Items will still be enabled after player leaves the server
2016-06-23 16:09:31 -03:00
1ea680cd20
Return to an invisible armor stand name
2016-06-22 21:01:37 -07:00
bcf82ad513
Remove debug messages
2016-06-22 21:00:50 -07:00
761e550d6c
Add shards to announcement message
2016-06-22 20:55:27 -07:00
621d72f541
Fix merge issues, update lore text
2016-06-22 20:51:58 -07:00
249a5c70aa
Merge remote-tracking branch 'remotes/origin/develop' into feature/boosters-final
...
# Conflicts:
# Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-22 20:35:40 -07:00
addbd4dd88
Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
2016-06-23 01:21:12 +01:00
a795ee3d0f
Fix feature initialisation code
2016-06-23 01:18:16 +01:00
09a74e3772
Work on pushing chat snapshots to db
2016-06-23 00:38:24 +01:00
56205a2505
Change scoring behavior to increase accuracy, increase power of right click throw, solve players becoming stuck in webs and border, solve ball becoming stuck outside border, perform other small gameplay tweaks
2016-06-22 18:25:32 -04:00
4e9ea23db8
Fix spawn facing, separate scoreboard functions
2016-06-22 21:47:39 +03:00
e855a866c7
Fix more thanks and booster occurrences
2016-06-22 08:58:27 -07:00
318c137aba
Moved mavericks repository resources to core, merging review and game
2016-06-22 17:08:34 +02:00
d9c5e6323a
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-22 00:36:23 -05:00
4d31867e98
PC Party updates.
2016-06-22 00:35:57 -05:00
d739df8623
UHC is faster now
2016-06-21 22:21:27 -05:00
0131850fc3
SSM fixes
2016-06-21 20:41:53 +01:00
a49e815765
Merge branches 'develop' and 'feature/party-v2' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-20 16:40:33 -05:00
2211cf4dec
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2016-06-20 16:37:07 -05:00
73183af9bf
Fixing podium npc bug
2016-06-20 00:45:57 -05:00
afc636b7c5
Fix amplifier reward message
2016-06-19 20:16:33 -05:00
bb8d94f38a
Fix a lot more Booster cases
2016-06-19 19:48:17 -05:00
63b7648608
Amplifier rename, move podium backwards
2016-06-19 19:05:04 -05:00
a830b5b388
Removal of debug message and compilation error
2016-06-19 17:12:58 +01:00
Sam
Keir Nellyer
AlexTheCoder
xXVevzZXx
TadahTech
cnr
Shaun Bennett
Thanos Paravantis
samczsun
xGamingDudex
LCastr0