JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,363 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

9363 Commits

Author SHA1 Message Date
Keir Nellyer e54f70d194 JavaDocs for abortReport and assignTeam methods 2016-09-28 10:31:54 +01: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
Sam 78e6f3bf71 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-27 19:02:56 +01:00
Sam 68c62acb00 Guardian changes 2016-09-27 19:02:54 +01:00
Keir Nellyer 1543b539ba Refactor unbox optional collection to utility class 2016-09-26 11:01:27 +01:00
Keir Nellyer f42681c390 Remove old todo 2016-09-26 10:33:46 +01: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 125428d09e Make getReport return Optional as it is quite likely that this will 
return null
 2016-09-26 10:02:30 +01:00
Sam 96e1e944e1 Addition of the GWEN kit and a billion other things 2016-09-25 22:32:23 +01:00
samczsun b35d933e56 Fix PlayWire error, handle future errors properly 2016-09-25 16:28:02 -04:00
samczsun 3f3241bec9 Reformat developer servers 2016-09-25 16:28:01 -04:00
Keir Nellyer 32385d4064 Update error message for non-titans, due to change made in previous commit 2016-09-25 02:28:42 +01:00
Keir Nellyer a413df9f52 Limit feature to titans for damage limitation 2016-09-25 02:01:10 +01:00
Keir Nellyer 42ea7f85af Remove un-required tab changes 2016-09-25 01:36:23 +01:00
Keir Nellyer 17b98888fc Update database upgrade script for latest changes 2016-09-25 01:29:18 +01:00
Sam f8a135cf50 Full system conversion 2016-09-25 00:56:06 +01:00
Sam 315a50aa16 Whoops 2016-09-24 21:34:45 +01:00
Sam baafa62713 Just more converting 2016-09-24 21:09:25 +01:00
LCastr0 1475243d8a Added MetalMan to the GUI for testings 2016-09-23 23:14:10 -03:00
Sam f5a7f35d94 More kits 2016-09-23 18:58:14 +01:00
samczsun 187c6ec67c Remove debug messages 2016-09-22 21:25:40 -04:00
samczsun 548e23a212 Fix fetching timestamp from wrong column 2016-09-22 21:21:16 -04:00
Sam f6acedba5f Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-22 17:11:25 +01:00
Sam 2ba2b21577 Progress on converting SSM to a new cleaner system 2016-09-22 17:11:21 +01: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
Keir Nellyer df17177892 PC-1003 Forgot to commit some changes from last commit 2016-09-22 16:10:31 +01:00
Keir Nellyer ea74826d0c PC-1003 Prevent rogue Report objects being cached and cause handler message spam 2016-09-22 16:01:11 +01:00
Keir Nellyer 6494720d2e PC-998 Limit chat messages to 3 minutes 2016-09-22 15:48:01 +01:00
Shaun Bennett 79e6903c8b Enable Speed and Glide punishments, remove hack from ban reason 2016-09-22 08:44:58 -04:00
Shaun Bennett 7f447f8084 Setup compass for game changes 2016-09-22 00:33:48 -04: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 7252906d30 Better synchronization of Managers 2016-09-21 21:37:57 -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 1eecfbafee Small code improvement 2016-09-21 16:33:05 +01:00
Keir Nellyer c6eb23812f PC-1001 Do not show private messages between users unless reporter is 
involved
 2016-09-21 13:21:23 +01:00
Keir Nellyer 09287ddefc PC-1002 Automatic reports bans show the id of the report which caused 
the ban
 2016-09-21 12:22:55 +01:00
Keir Nellyer e73b06b5ab PC-998 Change cache time for chat messages to 5 minutes 2016-09-21 11:46:03 +01:00
Sam 209ea32ef9 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/ssm 2016-09-20 09:18:20 +01:00
Keir Nellyer 32563904fa PC-997 Show total counts when showing report statistics 2016-09-19 10:38:03 +01:00
LCastr0 f0c7b1d6aa Whoops, forgot this 2016-09-18 16:18:33 -03:00
LCastr0 537dc28daa Used proper method to add specific prizes 2016-09-18 16:16:57 -03:00
LCastr0 ae6868b76a Added Witch Morph 
Added Metal Man morph
 2016-09-16 20:46:52 -03: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