Commit Graph

4357 Commits

Author SHA1 Message Date
Rsl1122
435dbc17fc RAM Graph 2017-07-27 19:51:26 +03:00
Rsl1122
882fe3dad3 Made Geolocation Map relative of screen width and height
Javadocs
2017-07-27 18:19:19 +03:00
Rsl1122
81a2c26832 Merge remote-tracking branch 'origin/3.6.0' into 3.6.0
# Conflicts:
#	Plan/src/main/resources/analysis.html
2017-07-27 17:54:34 +03:00
Rsl1122
f5274a2069 Add New Players Graphs to Online Activity 2017-07-27 17:44:17 +03:00
Fuzzlemann
fc3f7c96f7 Fixes method terminating in player.html & analysis.html 2017-07-27 15:46:43 +02:00
Fuzzlemann
0f530b6e61 Reformat code 2017-07-27 15:08:34 +02:00
Fuzzlemann
6e2a848a74 Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-27 15:02:46 +02:00
Rsl1122
fbf2a78a91 Add APF Notification prompt to Join Event Listener. 2017-07-27 14:56:17 +02:00
Rsl1122
7072940121 Adds In-depth help messages to commands (/plan <cmd> ?) 2017-07-27 14:56:17 +02:00
Rsl1122
6c52743be8 Merge pull request #201 from Fuzzlemann/master
PR for 3.6.0 (Fuzzlemann) (2)
2017-07-27 15:50:05 +03:00
Fuzzlemann
97e2950af1 Merge branch '3.6.0' into master 2017-07-27 14:47:21 +02:00
Fuzzlemann
845a991308 Remove unused methods
Now supports wolf kills (issue #146)
2017-07-27 14:41:48 +02:00
Rsl1122
230eb7fc82 Add APF Notification prompt to Join Event Listener. 2017-07-27 15:21:04 +03:00
Rsl1122
75d3e5fa20 Adds In-depth help messages to commands (/plan <cmd> ?) 2017-07-27 15:14:07 +03:00
Fuzzlemann
2df8e7a4a2 Adds the CPU box (Was removed because I took the 3.5.4 one by an accident 2017-07-27 13:18:03 +02:00
Fuzzlemann
3c63fde839 Light reformat, map now really scales (Wasn't pushed last time) 2017-07-27 13:09:08 +02:00
Fuzzlemann
1e1180280b Merge branch '3.6.0' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-27 12:23:27 +02:00
Rsl1122
7b067b5252 Move to using APF v2.0.1
Fix TPS Table not having RAM column on new databases
2017-07-27 13:10:59 +03:00
Fuzzlemann
c6d4444bd6 Fix MB conversion at RAM usage 2017-07-27 12:03:07 +02:00
Rsl1122
53cbe88a2c Added new TPS Table columns
Added Worlds Table
Added WorldTimes Table
DB Version bumped to 7

Added averages for deaths, mobkills & playerkills
2017-07-27 10:32:45 +03:00
Rsl1122
65d0e09ace Fix #198 2017-07-27 09:35:06 +03:00
Rsl1122
9c67c7b69d Merge pull request #196 from Fuzzlemann/master
PR for 3.6.0 (Fuzzlemann)
2017-07-27 09:19:51 +03:00
Fuzzlemann
0359faf694 Adds recognition as Paper, when the server name is TacoSpigot (A fork of Paper) 2017-07-27 00:41:24 +02:00
Fuzzlemann
7486030b58 Some typo fixes
Adds the pie chart "Server Type", needs support from Rsl
2017-07-27 00:27:02 +02:00
Fuzzlemann
176d28a535 Code Cleanup
Geolocation Map now scales
2017-07-26 22:27:07 +02:00
Fuzzlemann
2f16beebe4 Adds the variables for
RAM Usage
Chunks loaded
Entities living
2017-07-26 19:54:14 +02:00
Fuzzlemann
63684efead Preparation for adding more Server Performance Graphs:
RAM Usage
Chunks loaded
Entities living
2017-07-26 19:24:21 +02:00
Fuzzlemann
dec0262477 Add JavaDoc for new placeholders 2017-07-26 17:14:50 +02:00
Fuzzlemann
e806430c29 Adds %averagecpuweek% and %averagecpuday%
Feature / "Issue" #195
2017-07-26 17:13:04 +02:00
Fuzzlemann
de85aa3491 Removed additional rounder, cpu usage already rounded at insertion of data 2017-07-26 17:09:09 +02:00
Fuzzlemann
8da23eab78 Fixed a typo 2017-07-26 16:53:22 +02:00
Fuzzlemann
8121bb758d Revert changes at analysis.html and player.html 2017-07-26 16:02:59 +02:00
Fuzzlemann
8186f06d96 Reformatted code 2017-07-26 15:46:20 +02:00
Fuzzlemann
2a7ef0ab46 Fixed some typos 2017-07-26 15:21:43 +02:00
Fuzzlemann
322b81a28d Fixed command recognition 2017-07-26 12:56:01 +02:00
Fuzzlemann
047446bcd6 Merge branch 'master' of https://github.com/Rsl1122/Plan-PlayerAnalytics 2017-07-26 12:15:11 +02:00
Fuzzlemann
8f1fabb9de Fixes that the cases of MySQL & SQLite affected the graph 2017-07-26 12:08:35 +02:00
Rsl1122
fc814b1d1b [3.5.5] Merge pull request #181 from Rsl1122/3.5.5
Pull Request for 3.5.5
2017-07-26 11:16:30 +03:00
Rsl1122
85254fcba8 Fix #186
Add CPU Graphs
Fix CPU displaying -25 when not available, now displays -1

Bumped version to 3.5.5
2017-07-26 11:15:48 +03:00
Rsl1122
89f5f4dd27 Merge pull request #191 from Fuzzlemann/master
Final PR for 3.5.5
2017-07-26 09:59:37 +03:00
Fuzzlemann
869171a619 Further conversion to .toString() 2017-07-25 23:51:19 +02:00
Fuzzlemann
510aeb3941 Remove Exception thrown in JavaDoc that wasn't thrown 2017-07-25 23:42:01 +02:00
Fuzzlemann
72a51da063 Correctly fix round method 2017-07-25 23:07:49 +02:00
Fuzzlemann
03722cf614 Fix DecimalFormat 2017-07-25 23:04:34 +02:00
Fuzzlemann
6a3a27488e Fix tests 2017-07-25 22:55:03 +02:00
Fuzzlemann
f188d965a4 Fix tests 2017-07-25 22:53:03 +02:00
Fuzzlemann
c3f2b6a7e6 Update dependencies 2017-07-25 22:42:27 +02:00
Fuzzlemann
6a67f938c5 Update dependencies 2017-07-25 22:36:07 +02:00
Fuzzlemann
4605a42d42 Update dependencies 2017-07-25 22:35:04 +02:00
Fuzzlemann
181fe7ad3e Update dependencies 2017-07-25 22:31:48 +02:00