Commit Graph

8189 Commits

Author SHA1 Message Date
cnr
d54e47d8ea Check for uptimes field 2016-07-14 11:22:10 -05:00
cnr
a0847b8d1a Fix null ServerGroup uptimes value for MPSes 2016-07-14 08:08:24 -05:00
cnr
1a2e0df6ca Only allow OPs to use minestrike debug commands 2016-07-14 07:28:33 -05:00
cnr
1d1c3ef1be Merge branch 'thanos-mineware' into develop 2016-07-14 03:41:00 -05:00
Thanos Paravantis
40345bc93c Fix Bawk Bawk Battles game start 2016-07-14 11:23:39 +03:00
cnr
4d0903dba7 Fix compile error 2016-07-14 03:11:59 -05:00
Shaun Bennett
e28320b361 Fix disableCustom not firing properly 2016-07-14 02:47:49 -05:00
cnr
7cc44c8bfc Merge branch 'thanos-mineware' into develop 2016-07-14 00:22:01 -05:00
Thanos Paravantis
906762e9db Remove debug commands 2016-07-14 08:17:36 +03:00
cnr
917b83250d Revert "Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing"
This reverts commit 30287a0832, reversing
changes made to b8650d741d.
2016-07-14 00:10:37 -05:00
samczsun
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
cnr
a7b30f4f59 Merge branch 'thanos-mineware' into develop 2016-07-13 21:26:25 -05:00
cnr
4343fa3512 Merge branch 'project-cosmetics' into develop 2016-07-13 21:22:41 -05:00
Shaun Bennett
a34ac42093 Amplifiers adjustment - shards only 2016-07-13 19:26:23 -05:00
LCastr0
6af04b5438 Fixes for winroom gadget disable messages 2016-07-13 18:21:08 -03:00
Thanos Paravantis
6082418fc7 Update game tags on the hub game compass 2016-07-13 23:59:37 +03:00
Thanos Paravantis
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
Shaun Bennett
369dabffae Amplifier updates - move to boost shards only 2016-07-13 15:07:24 -05:00
Thanos Paravantis
711a04ffa8 Add Bawk Bawk Battles to hub compass 2016-07-13 21:40:31 +03:00
Thanos Paravantis
3497a4c095 Remove unused debug messages 2016-07-13 19:29:48 +03:00
AlexTheCoder
9c3aee6373 Convert all possible gem vote rewards to treasure shard vote rewards to comply with Mojang EULA 2016-07-13 11:17:24 -05:00
Thanos Paravantis
6c11b718af Remove suppress warnings annotations 2016-07-13 19:03:39 +03:00
Thanos Paravantis
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
Thanos Paravantis
ad32f4e2f1 Remove unnecessary new string declaration 2016-07-13 18:05:35 +03:00
Thanos Paravantis
839d9263fd Prevent game crash if started with one player 2016-07-13 18:03:38 +03:00
Thanos Paravantis
efce89a7e7 Fix Color Change platforms not removed properly 2016-07-13 17:47:17 +03:00
Thanos Paravantis
2e5d7c023f Fix Tag Master, show bouncing block full score 2016-07-13 17:13:02 +03:00
cnr
7df228a8fa Move WinEffectGadget schematics to update folder 2016-07-13 06:36:42 -05:00
Thanos Paravantis
6cef42d7a4 Fix merge issues 2016-07-13 13:36:59 +03:00
Thanos Paravantis
179b59af2c Merge branch 'develop' into thanos-mineware 2016-07-13 13:28:03 +03:00
Thanos Paravantis
943dc88ca4 Modify challenge list, change display messages 2016-07-13 13:23:15 +03:00
cnr
e40abd4859 Merge branch 'thanos-mineware' into develop 2016-07-13 05:04:50 -05:00
Sam
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
Sam
5382afedda Sharpshooter arrow limit changed to 4 2016-07-12 21:56:25 +01:00
cnr
85db0ad613 Remove global rawr 2016-07-12 15:51:47 -05:00
xXVevzZXx
654ab281ea Add option of "uptimes" to servergroups 2016-07-12 15:44:29 -05:00
Thanos Paravantis
0f3b2da8b7 Fix Bouncing Block, re-add features for testing 2016-07-12 23:02:01 +03:00
cnr
daddaa477e Merge branch 'update/brawl-games' into develop 2016-07-12 06:45:32 -05:00
xXVevzZXx
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
xXVevzZXx
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
Sam
5bf0ef545b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 23:19:39 +01:00
AlexTheCoder
30287a0832 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing 2016-07-11 14:46:08 -04:00
AlexTheCoder
69c9ef8074 Implement small ability tweaks for Game Insights team 2016-07-11 14:45:54 -04:00
Sam
f40299e402 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/skywars-finalised 2016-07-11 18:34:48 +01:00
Thanos Paravantis
6a87be13f0 Remove features that contain bugs 2016-07-11 01:02:19 +03:00
Thanos Paravantis
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
Thanos Paravantis
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
Thanos Paravantis
a9f41ab269 Refactor project classes 2016-07-09 12:00:06 +03:00
xGamingDudex
b8650d741d Fixed PC-707
Fixed arrows damaging the shooter.
Fixed all instances of arrows bouncing of targets.
2016-07-08 16:48:17 -05:00
xGamingDudex
96d16be5b7 Fixed PC-706
Tweaked settings to reasonable values in local testing.
2016-07-08 16:48:11 -05:00
Timothy Andis
2cac4c9c66 Remove toLowerCase owner method 2016-07-08 16:17:48 -05:00
TadahTech
cbb0fa37fb Lang tweaks. 2016-07-08 15:32:25 -05:00
cnr
5b98bfddce Update YouTube link to landing + sub confirmation 2016-07-08 15:20:50 -05:00
Thanos Paravantis
331c1bcf91 Merge branch 'develop' into thanos-mineware 2016-07-08 22:29:59 +03:00
Thanos Paravantis
7887c96cc9 Decrease delay between challenges 2016-07-08 22:28:53 +03:00
TadahTech
1313db4071 Commit lost file. 2016-07-08 14:06:16 -05:00
Thanos Paravantis
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
TadahTech
ce72d25832 Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2 2016-07-08 13:09:02 -05:00
TadahTech
8c7308add5 Add documentation.
Refactor code.
Remove most command backend capabilities to limit user error.
Cleanup.
2016-07-08 13:08:34 -05:00
Alex-The-Coder
e8a1c9bcba Add damage check to the Enchantment Handler...
...to avoid performing calculations where it is not necessary
2016-07-08 07:42:00 -04:00
Sam
da9ad913b2 Finalisation of update 2016-07-07 23:03:23 +01:00
xXVevzZXx
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
cnr
443576ba1a Update YouTube link and send shard reward message 2016-07-06 20:15:41 -05:00
samczsun
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
Shaun Bennett
8cf470cfd0 Update fountain goals 2016-07-06 13:39:56 -05:00
cnr
17f89f6937 Merge branch 'project-cosmetics' into develop 2016-07-06 13:00:29 -05:00
Thanos Paravantis
04f0ef199c Make CustomFirework singleton class public 2016-07-06 20:47:28 +03:00
LCastr0
63500c19c9 Removed commented lines
Added javadocs to GadgetChangeEvent
2016-07-06 14:45:05 -03:00
Thanos Paravantis
989dd98212 Fix players not losing on Pick a Side 2016-07-06 20:41:26 +03:00
Thanos Paravantis
6a66d6cc92 Lower barrier spawn chance on Cloud Fall 2016-07-06 20:40:51 +03:00
Thanos Paravantis
7319965c45 Temporarily fix challenge completion/lose issues 2016-07-06 20:40:15 +03:00
Thanos Paravantis
47f62e2c89 Make lava run a bit more difficult 2016-07-06 20:39:37 +03:00
xXVevzZXx
36285ee101 Improve GunModule with editable variables 2016-07-06 18:55:13 +02:00
xXVevzZXx
4dedd27227 finish up editing of arrays for gamemodes 2016-07-06 18:34:15 +02:00
Thanos Paravantis
185ba600ca Merge branch 'develop' into thanos-mineware 2016-07-06 17:48:31 +03:00
Thanos Paravantis
e326fd322c Update Pick a Side, refactor Reverse Tag 2016-07-06 17:45:51 +03:00
Thanos Paravantis
29434b786e Apply completion/lost bug fixes 2016-07-06 17:45:22 +03:00
xXVevzZXx
3e77ce0f00 make arrays parseable by variables 2016-07-06 14:03:41 +02:00
xXVevzZXx
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
Thanos Paravantis
ab4174cfb9 Refactor Red Light, Green Light and Volley Pig 2016-07-06 12:04:04 +03:00
Thanos Paravantis
e0d133ab67 Broadcast a message when timer runs out 2016-07-06 11:10:57 +03:00
Thanos Paravantis
de74716abf Refactor Treasure Digger and Volley Pig 2016-07-06 11:10:21 +03:00
Thanos Paravantis
ae60d05bbb Refactor Wave Crush 2016-07-06 10:25:20 +03:00
Thanos Paravantis
b40346417a Remove unused project files 2016-07-06 10:25:05 +03:00
LCastr0
67adb34311 Fixes for the WinRooms
Removed Freedom Chests from the menu
2016-07-06 00:00:50 -03:00
AlexTheCoder
eccd7deedc Fix merge errors and properly force disable particles by checking the game's settings 2016-07-05 17:25:01 -04:00
Thanos Paravantis
0eab6db116 Soccer bug fixes and minor improvements
- Slimeball will no longer be able to get stacked.
- Players in soccer mode will not able to stack others.
- Guardian lazer can no longer be used in the soccer field.
- Players in soccer won't get knockback, except if they double jump.
2016-07-05 15:39:10 -05:00
Thanos Paravantis
607b92984e Fix hologram elevation speed 2016-07-05 23:18:29 +03:00
TadahTech
9f58e57a67 Bug fixes. 2016-07-05 14:35:37 -05:00
Thanos Paravantis
00c3584c0b Make score holograms elevate faster 2016-07-05 21:14:13 +03:00
Thanos Paravantis
6a8c30d496 Refactor Mini OITQ and Water Horror 2016-07-05 21:13:49 +03:00
Thanos Paravantis
071f0c4de7 Refactor Ore Run and Rush Push 2016-07-05 19:39:30 +03:00
Thanos Paravantis
f36244efc6 Refactor Lava Run and Milk a Cow 2016-07-05 19:27:59 +03:00
Thanos Paravantis
108031acf1 Refactor Kangaroo Jump and King of the Ladder 2016-07-05 18:53:53 +03:00
Thanos Paravantis
f64234e4d1 Refactor Falling Blocks and Fast Food 2016-07-05 18:14:31 +03:00
Connor James
c0680b3511 Merge pull request #130 from Mineplex-LLC/bugfix/mopple-sprint
Numerous Bug fixes
2016-07-05 10:01:58 -05:00
Thanos Paravantis
ba02c94e08 Refactor Dogs Vs Cats and Egg Smash 2016-07-05 17:00:38 +03:00
Thanos Paravantis
5d01bc2863 Refactor Deadly TNT and Diamond Hunt 2016-07-05 16:30:51 +03:00
Thanos Paravantis
fe89a0f094 Refactor Cloud Fall and Color Change 2016-07-05 16:17:19 +03:00
Thanos Paravantis
361e857bc7 Refactor Build Race and Chicken Shooting 2016-07-05 15:54:43 +03:00