Keir Nellyer
c076a46078
Show all involved users correctly
2016-06-29 22:13:13 -04:00
Keir Nellyer
1c73d2a793
Fix age of report not showing when no chat messages
...
Use a dummy value for now until I get the system to calculate the age
of the report.
2016-06-29 18:16:26 -04:00
Keir Nellyer
a3f4a4c185
Change message for when there are no chat messages for a report
2016-06-29 18:07:26 -04:00
Keir Nellyer
e1a32b6da0
Show error messages for reports which do not have any related chat
...
messages
2016-06-29 18:06:30 -04:00
xXVevzZXx
880ac6b88f
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes
2016-06-29 06:21:18 +02:00
Keir Nellyer
d2b1a7b0c1
Add todo for handling invalid report number input
2016-06-28 21:50:33 -04:00
LCastr0
671dcaf3aa
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
2016-06-28 18:14:05 -03:00
LCastr0
324a967135
Merge pull request #118 from Mineplex-LLC/develop
...
Merge develop into project-cosmetics
2016-06-28 18:13:09 -03:00
LCastr0
24186d9992
More fixes for gadget persistence
2016-06-28 18:11:00 -03:00
Thanos Paravantis
04cb0fb0b0
Use updated ProjectileUser method names
2016-06-28 23:09:52 +03:00
Thanos Paravantis
4436ba0710
Merge branch 'develop' into thanos-mineware
2016-06-28 23:05:11 +03:00
Thanos Paravantis
c5c08562c3
Merge branch 'master' into thanos-mineware
2016-06-28 23:01:42 +03:00
Thanos Paravantis
42ebb95db1
Fix NPE on zombie infection
2016-06-28 21:57:32 +03:00
Thanos Paravantis
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
Thanos Paravantis
5e9f16424c
Add shouldDie method, update zombie wrapper name
2016-06-28 20:38:32 +03:00
Thanos Paravantis
43f375fd86
Reset team data on team challenges
2016-06-28 20:37:26 +03:00
Thanos Paravantis
eea980b354
Apply smoother knockback on volley pig
2016-06-28 18:41:50 +03:00
Thanos Paravantis
c5367d4510
Remove double plants entire from spawn locations
2016-06-28 12:15:49 +03:00
Thanos Paravantis
cf434b92de
Modify punch the pig description
2016-06-28 11:47:47 +03:00
Thanos Paravantis
dc250d4bf2
Store locations after game start (fix NPE)
2016-06-28 11:47:25 +03:00
Thanos Paravantis
7218dc710f
Retrieve scoreboard data only when possible
2016-06-28 11:46:38 +03:00
Keir Nellyer
561734e7fe
Remove unused imports (accidentally added)
2016-06-27 21:18:40 -04:00
Keir Nellyer
128f6af83d
Show time of last report and time since
2016-06-27 18:15:41 +01:00
Keir Nellyer
48a2d0d304
Remove old completed todo
2016-06-27 18:06:01 +01:00
Keir Nellyer
42bd2148e5
Don't allow a user to handle more than one report simultaneously
2016-06-27 17:56:01 +01:00
Keir Nellyer
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
Keir Nellyer
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
xXVevzZXx
c966620808
Change resourcepack links
2016-06-25 19:52:22 +02:00
xXVevzZXx
fbd9b17ba0
fix playeringametime being 0
2016-06-25 12:35:59 -05:00
xXVevzZXx
8d4f5f0f93
Modularize Minestrike and add Strike Games
2016-06-25 19:11:08 +02:00
Thanos Paravantis
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
Thanos Paravantis
bc229c44aa
Apply small changes to Zombie Infection
2016-06-25 11:56:55 +03:00
xXVevzZXx
7a55b131d4
Add SmasgDom, Smash Glags, Tiny Smash, Smash Sheep, Sky Smash, Changing Kits and OP Sheep
2016-06-25 09:11:42 +02:00
LCastr0
30f413d04e
Fixes for persistence:
...
No longer save items after they are disabled
No longer keep the particle effect after a staff vanishes
2016-06-25 02:22:20 -03:00
TadahTech
50759661cf
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/party-v2
2016-06-24 23:52:27 -05:00
xXVevzZXx
b34d652617
Add Lucky Bridges, CookieFight and OP MB
2016-06-25 06:35:08 +02:00
LCastr0
d75abe3aea
Persistence fixes
2016-06-25 00:36:00 -03:00
LCastr0
83f4b25887
Testing persistence fixes
2016-06-25 00:33:36 -03:00
LCastr0
a18976649b
Merge pull request #116 from Mineplex-LLC/develop
...
Merge develop into project-cosmetics
2016-06-25 00:27:01 -03:00
xXVevzZXx
285d94a2ca
Fill hotbar editor with glass panes
2016-06-25 04:48:59 +02:00
cnr
c430566c6d
Never reset a player's YouTube click time locally
2016-06-24 16:59:27 -05:00
Shaun Bennett
94fe9f57d2
Add missing imports
2016-06-24 12:36:56 -07:00
Kenny Goodin
dc9145c707
Hotfix, disable youtube and twitter buttons in BonusGUI
2016-06-24 15:33:07 -04:00
Keir Nellyer
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
Keir Nellyer
c5319dbe1d
Switch identifier system for id system (no need for tokens any more)
2016-06-24 18:08:47 +01:00
Keir Nellyer
6028bfb0d0
Make expanded pages work again
2016-06-24 18:06:33 +01:00
Keir Nellyer
52873d5618
Do away with tokens
2016-06-24 17:59:26 +01:00
Keir Nellyer
45418b3a4d
Add todo
2016-06-24 17:56:01 +01:00
Keir Nellyer
daae2f7a3a
Shorten method name
2016-06-24 17:54:54 +01:00
Keir Nellyer
871bb04451
Fix /reporthandle command
2016-06-24 17:45:56 +01:00
