Commit Graph

4029 Commits

Author SHA1 Message Date
Shaun Bennett 3ede0e5644 Merge Report System v2 (#216)
Report system (v2)
2016-09-28 17:39:26 -04:00
Timothy Andis 3d7647b26b Game Lobby Update (#215)
* Game Lobby update. Phase 1.

* Correctly apply kit data to players who use the next best game feature.

* I can do integer comparisons, I promise.

* So much stuff, all minor.

* Suck it Carl.

* Fix Party bug.
Update LobbyManager

* Allow QA to test KitProgression @shaun cherry pick this plz.

* Proper generation check (testing)
Remove debugging from NextBestGame

* Correct Amplifier looking direction.
Fix Death tag hard coded kits
Misc podium work.

* ClansHub and Tweaks to the lobby manager

* WA Tweak.
2016-09-28 10:17:05 -04:00
Sam c4e36b2269 Moppletop's September Bug Sprint (#214)
* Earth Cost issue

* Instances of "Tip" to "Thank"

* PC-930

Fix an infinite loop when the game ends.

* PC-959

Fixes an issue where people could spam drop grenades.

* PC-668

Cosmetic Set bonuses no longer carry into MS games

* Changes metal's passive

Metal's passive is now that it gains 0.5 hearts per armor piece. This
avoids the problem of being unkillable
2016-09-27 21:11:49 -04:00
Keir Nellyer f63561b05e Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-26 10:19:13 +01:00
Keir Nellyer 42ea7f85af Remove un-required tab changes 2016-09-25 01:36:23 +01:00
samczsun 187c6ec67c Remove debug messages 2016-09-22 21:25:40 -04:00
Keir Nellyer b24429783b Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-22 16:28:16 +01:00
Shaun Bennett a3d210871d Add ignored checks to GWEN (#211) 2016-09-21 23:21:02 -04:00
Shaun Bennett e15804fc15 Prevent players from joining 1.9+ games with 1.8 clients (#212) 2016-09-21 23:19:55 -04:00
Shaun Bennett 9be26a92d1 Remove NCP 2016-09-21 22:21:49 -04:00
Sam ac967f6b18 OITQP no longer in Beta (#210)
* Convert OITQP into a module based system.

* More magic modules

* Achievements and Stats

* Achievement menu update

* Removed some Util methods I added that were never used.

* Missed a few things

* To Alex, Love Sam

* Gem and achievement kits
2016-09-21 22:05:21 -04:00
Sarah c1c46aceb8 Skyfall Game(#208)
* basic prototype of the game Skyfall

* new crumble mechanic

* Developing basic game with basic mechanics and basic kits.

* Fix merge issues

* Add Supply Grop and Deathmatch and change map crumbling

* Make cosmetical changes for QA and add Stat Trackers and Achievements

* Add version requirement

* Change scoreboard layout

* Dont crumble the first island, but the islands over the spawn points

* Remove Surefoot, fix TNT, remove boats and remove elytra on contact with water/lava

* Unused imports

* Fix kit description, modify island crumbling and add ring damage

* Revert to normal crumble values

* Add Javadoc

* Remove more unused imports

* Check for material data on ring generation

* Add Block effect for Booster Ring recharge

* Unused imports...

* Add Elytra removal message and countdown

* "Fix" food issues and some other minor things

* Add chest refill to scoreboard from beginning

* Fix supply drop

* Unused imports.....

* Re-enable Anti Cheat

* Add java doc, remove system messages and add exeptions

* The end of the great label debate

* Fix method naming conventions

* Remove more labels

* Disable Booster kit
2016-09-21 21:57:38 -04:00
samczsun 92a0d606d4 Fix timings 2016-09-21 21:37:57 -04:00
samczsun ec4add259d Teleport players back to center of arcade lobby 2016-09-21 21:37:57 -04:00
Timothy Andis bf61296948 PlayWire Ad integration (#207)
* PlayWire integration.

* Tweak PlayWire display.
Update the GUI command.
Temp set cooldown to 10 seconds for testing *WILL BE REMOVED*

* PlayWire stuff.

* PlayWire streaks and tweaks.
2016-09-21 21:24:58 -04:00
Keir Nellyer 2cdab061b6 PC-886 Move report bans over to punishment gui 2016-09-16 17:40:14 +01:00
Keir Nellyer ebe212c8ff Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-15 17:30:27 +01:00
Alexander Meech 93c227a22d Change Mavs Basketball to 5 Minutes (#201)
* Update ScoringManager.java
* Update Basketball.java
2016-09-14 20:49:24 -04:00
Keir Nellyer 5e5cb3284a Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2 2016-09-12 10:11:31 +01:00
Sam 38473dcffd Fix metal taking too little damage with full iron (#203) 2016-09-10 22:47:52 -04:00
Shaun Bennett e12ed35da1 Fix NPE and kit upgrades issue 2016-09-07 23:13:28 -04:00
Shaun Bennett 9318ba4de2 Merge branch 'develop' into bugfix/samczsun
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
2016-09-07 20:12:57 -04:00
Sam 5bf35d49db Message inconsistancy 2016-09-06 21:38:43 +01:00
Sam 7a5a6c3d00 Fix duplicate message 2016-09-06 19:55:31 +01:00
samczsun 08090f5e06 PC-818
Seismic Charges can no longer remove barrier blocks
2016-09-05 18:25:16 -04:00
samczsun 11c97691a9 PC-937
This commit allows Arcade to consider spectating and vanished players when
deciding to autostart a game
2016-09-05 18:25:16 -04:00
samczsun 3aaa9b2514 Sort tab list properly 2016-09-05 18:25:16 -04:00
Sam 8ebaad4736 Beta ready commit 2016-09-05 17:59:49 +01:00
Keir Nellyer acd63c90a1 Merge branches 'develop' and 'feature/report-v2' of github.com:Mineplex-LLC/Minecraft-PC into feature/report-v2
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/UserPreferences.java
#	Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
#	Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
2016-09-05 14:26:06 +01:00
Sam 34ee62bdc3 Fix NPE 2016-09-03 20:32:10 +01:00
Sam b3212fc003 Particle changes 2016-09-03 20:13:08 +01:00
Sam 4b1c93150b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 20:12:39 +01:00
Sam 8d5d0c6272 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/oitq 2016-09-03 18:29:37 +01:00
Sam fc0217f1fd More magic OITQ 2016-09-03 18:25:17 +01:00
Sam e0424c78b2 Added spawn barrier 2016-09-03 18:24:56 +01:00
Sam 7eb148cc59 Ultimate colour change 2016-09-03 18:24:44 +01:00
cnr 374142e63f Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:42:51 -05:00
TadahTech e2f974e1e6 Add sounds and messages to basketball. 2016-09-02 00:40:23 -05:00
cnr ae0d30558c Merge branch 'update/the-smoothest-release-we-will-never-have' into develop 2016-09-02 00:12:12 -05:00
cnr f6db5393a3 Merge branch 'project-cosmetics' into develop 2016-09-02 00:08:23 -05:00
TadahTech 9e0bb6ff96 Tweak invite starting index.
Disable NextBestGame in an MPS
2016-09-01 20:59:28 -05:00
TadahTech d8486abbfd Fix minor best game issues. 2016-09-01 20:05:53 -05:00
TadahTech a6360249b7 Use party if a player has it. 2016-09-01 08:47:43 -05:00
TadahTech 6f3d7dcd29 Merge branches 'develop' and 'update/the-smoothest-release-we-will-never-have' of https://github.com/Mineplex-LLC/Minecraft-PC into update/the-smoothest-release-we-will-never-have 2016-09-01 08:45:43 -05:00
TadahTech 41936e0efc Remove users from the map. 2016-09-01 08:31:16 -05:00
TadahTech fdc54e1dd1 Fix BestGame not cancelling for parties. 2016-09-01 08:29:51 -05:00
cnr 05f640266f Fix basketball scoring infinite loop 2016-09-01 06:36:47 -05:00
TadahTech 53846acbf6 Dont let Minestrike use NextBestGame 2016-09-01 05:39:47 -05:00
TadahTech 46053e82e1 Mavs changes. 2016-09-01 02:35:31 -05:00
cnr 9cd5b73432 Merge branch 'update/basketball-game' into develop 2016-08-31 23:19:51 -05:00