1042032836
Update the web side to handle to handle the new changes.
2015-12-15 21:36:54 +00:00
6d9bcb8e66
Reworked serialization and store more data in json files for later parsing.
...
Internally store UUIDs for reports and convert them as needed for display to user.
Many other misc. changes and refactorings.
2015-12-15 21:30:45 +00:00
50753e30e6
Clicking a users name copies it to the users clipboard and also displays an alert to the user that this has happened.
2015-12-13 19:12:32 +00:00
a1f1667647
Fix "Player.php" filename case.
2015-12-11 12:28:38 +00:00
4b122b16ae
Fix formatting.
...
Fix "Player.php" filename case.
2015-12-11 12:28:12 +00:00
7749401e62
Show UUID when clicking on a username (temporary).
2015-12-09 20:05:24 +00:00
8459cf0f95
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-09 18:13:26 +00:00
54157024f7
Committing current progress, can't afford to lose this again
2015-12-09 18:06:04 +00:00
2e49611035
LinkedHashMaps, Buttons
2015-12-08 17:45:27 -05:00
7f75749194
Merge remote-tracking branch 'origin/master'
2015-12-08 16:55:14 -05:00
26c5c419f8
fixed a bug where old displayName would be used after name was updated.
2015-12-09 08:38:05 +11:00
fba88ec231
mount stuff is fixed
2015-12-09 08:19:55 +11:00
2decc049c5
fixed my muddling of perks
2015-12-09 07:47:07 +11:00
09d8367b4b
fixed method
2015-12-09 07:32:36 +11:00
0b8e0409b6
Merge pull request #92 in MIN/mineplex from update-SSM to master
...
* commit '504a49278cb7e140029e4c2ceb85f3defe524a33':
SSM kit description change, grammar mistake
SSM Pig bomb bug fix
2015-12-08 14:29:32 -06:00
ca71f1f64f
Merge remote-tracking branch 'origin/master'
2015-12-08 14:32:17 -05:00
9ce7b25482
Prevent escaping in id string.
2015-12-08 18:37:05 +00:00
504a49278c
SSM kit description change, grammar mistake
2015-12-08 16:35:49 +00:00
2bf1012fa4
SSM Pig bomb bug fix
2015-12-08 16:34:07 +00:00
a1915e324c
Some java 8 code
2015-12-08 08:42:45 -05:00
addb2c8c0e
Fix java 8 compiler issue
2015-12-08 08:02:40 -05:00
89e8a7a2b5
Merge pull request #91 in MIN/mineplex from clans-beta to master
...
* commit 'b22c64ca6a5419e6b23abea1681cc750d15b6d37':
Fix excludes
2015-12-08 04:51:58 -06:00
b22c64ca6a
Fix excludes
2015-12-08 05:51:21 -05:00
ffbf76a125
Merge pull request #90 in MIN/mineplex from clans-beta to master
...
* commit 'a84f580719d1b221bbcaa49cd19d4251defa3b11':
Update IntelliJ to Java 8
2015-12-08 04:46:47 -06:00
a84f580719
Update IntelliJ to Java 8
2015-12-08 05:45:26 -05:00
c22a206a0e
Added some documentation (mainly declaring variable types).
2015-12-08 10:38:44 +00:00
fe1f763374
changed order blocks will be added to the list
2015-12-08 15:26:32 +11:00
529eab5aef
Improved the report php code, made it more object orientated.
...
Commented out debug code.
2015-12-07 23:43:29 +00:00
719297ebb1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-08 10:31:25 +11:00
4ba2e8c96c
fixed old staff being stuck invis.
...
partially changed scoreboard to show playercount
2015-12-08 10:31:11 +11:00
42a0354c9e
Now Playing, Preference to disable ads
2015-12-07 18:28:05 -05:00
d38ce9ef1e
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
2015-12-07 18:54:53 +00:00
8ff034fb5d
Merge pull request #89 in MIN/mineplex from clans-beta to master
...
* commit 'eed6966a5b39d1fc9544055a5b5801758a62a56a':
Winter MOTD, Stat fixes (maybe?!)
made use ability teleport player back to where they should be
Forgot to push these changes last update!
fixed tnt blowing up in claims when offline
fixed task not getting cleanup up after /skiptutorial
fixed /skiptutorial not working, and fixed tutorial thinking you're still in tutorial after finishing/cancelling/skipping
Fix heavy attribute, disable claim visualizer
Disable subtasks for now
Clans alpha 0.17
clan claim visualizer
fixed infinite claims
2015-12-07 12:22:10 -06:00
eed6966a5b
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
2015-12-07 13:21:17 -05:00
c3ace42a68
Winter MOTD, Stat fixes (maybe?!)
2015-12-07 13:21:11 -05:00
31d05cdb3b
Fix error from last commit (git forced me to commit unfinished files due to the merge).
2015-12-07 18:13:48 +00:00
67b3fe1d23
Merge branches 'feature/report' and 'master' of ssh://184.154.0.242:7999/min/mineplex into feature/report
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/ExclusivePreferencesPage.java
# Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
2015-12-07 18:11:40 +00:00
ffbb057d23
Merge pull request #88 in MIN/mineplex from iKeirNez_Bugfix to master
...
* commit '9bd7869e2260e23a0ff981b7084ff9b4a3768b43':
Fix typo, "_hubInvisibilityToggled" was checked twice, whilst "_hubIgnoreVelocityToggled" was not checked at all. This causes hub velocity changes to not be saved.
2015-12-07 11:25:17 -06:00
eed944597c
Commit PHP code.
2015-12-07 17:05:58 +00:00
7984c0ac31
Add !
2015-12-07 06:12:49 -05:00
a39b11ce67
slowed meteors
2015-12-07 21:56:00 +11:00
1fe6b5489a
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 21:53:49 +11:00
d318a5cf87
interacto!
2015-12-07 21:53:34 +11:00
c6c012031f
Less ugly formatting
2015-12-07 04:44:19 -05:00
4354133de9
Add Minecraft timings to /lag
2015-12-07 04:40:34 -05:00
6e67f34db1
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-07 20:39:46 +11:00
e1efcabfbf
chat sale msgs
2015-12-07 20:39:31 +11:00
3cdf8c4b08
Merge remote-tracking branch 'origin/master'
2015-12-07 04:23:33 -05:00
2afbe23a7c
Load songs from update folder
2015-12-07 04:23:26 -05:00
7b11baf24b
Christmas sale bossbars
2015-12-07 20:20:49 +11:00
Keir
Shaun Bennett
Cheese
Teddy
Shaun Bennett