Commit Graph

11729 Commits

Author SHA1 Message Date
Sam
330ed28992 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-06 11:31:53 +01:00
Sam
8724a35269 Tron Hub Game 2017-09-06 11:22:49 +01:00
AlexTheCoder
64c2c65bd0 Fix debug permissions 2017-09-02 20:03:28 -04:00
AlexTheCoder
871f178419 Update ranks sql system to block a race condition and improve performance 2017-09-02 17:08:29 -04:00
cnr
b860a69d46 Allow event hosts to use /game 2017-09-01 23:14:26 -05:00
Sam
a7202c1ce9 Merge remote-tracking branch 'refs/remotes/origin/feature/leveling' into update/hub-makeover 2017-09-02 00:50:30 +01:00
Sam
6542f67d9b Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-02 00:50:24 +01:00
Sam
7a49eda472 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-09-02 00:49:46 +01:00
Sam
9b04361c6b Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-02 00:45:51 +01:00
Sam
64065f432c Fix loading NPCs from database 2017-09-02 00:43:14 +01:00
Alexander Meech
acae54f021 Fix StaffServer rank issues 2017-09-01 14:03:47 -05:00
Alexander Meech
05a7d8d93e Make permissions for /o inheritable 2017-09-01 14:03:47 -05:00
Alexander Meech
51798d5658 Give CMods access to /c x commands 2017-09-01 14:03:47 -05:00
AlexTheCoder
f5ae4a7ca5 Fix Rank Location not working due to incorrect UUIDs utilized 2017-09-01 14:03:47 -05:00
Alexander Meech
6f04292b2a Update ResetPlayerCommand.java 2017-09-01 14:03:47 -05:00
Alexander Meech
ec67641c22 Add TabListSorter to ClansHubs 2017-09-01 14:03:47 -05:00
Dan Mulloy
a8a6e13fa0 Tab list sorting by rank weight 2017-09-01 14:03:47 -05:00
cnr
81110ea4a3 Fix additional rank issues 2017-09-01 14:02:31 -05:00
Sam
87b977706d Fix compilation errors 2017-09-01 17:00:49 +01:00
Sam
02b28ea5b5 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:57:41 +01:00
Sam
f41e94a3f4 Fix compilation errors 2017-09-01 16:57:15 +01:00
Sam
69f7078534 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:44:58 +01:00
Sam
90d4f9c1f7 Make mounts use permissions 2017-09-01 16:43:43 +01:00
Sam
2b1af7804f Use permissions for NewNPC 2017-09-01 16:41:28 +01:00
Sam
8fa9eec4ce Merge remote-tracking branch 'refs/remotes/origin/feature/leveling' into update/hub-makeover 2017-09-01 16:33:22 +01:00
Sam
39792675dc Hub merges 2017-09-01 16:27:29 +01:00
Sam
07cc9c3646 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-09-01 16:27:18 +01:00
Sam
c520d605bf Forgot Achievement Manager 2017-09-01 16:21:46 +01:00
Sam
7e3e2b9ece Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-09-01 16:21:30 +01:00
Sam
cd99700eda Merge remote-tracking branch 'refs/remotes/origin/develop' into update/moba-cosmetics 2017-09-01 16:12:51 +01:00
cnr
cad44497bd Fix missed compile errors 2017-09-01 00:25:39 -05:00
cnr
d4e6860fb0 Accommodate relocatin of guava in spigot 2017-09-01 00:10:51 -05:00
Sam
df01074451 Increase animation speed and reduce armourstand amount 2017-08-31 23:21:28 -05:00
cnr
a1cca83394 Add FastBow thresholds 2017-08-31 23:21:14 -05:00
Sam
bf98437ca3 September PPC Cosmetic 2017-08-31 23:21:04 -05:00
cnr
9faeb955cb Fix rank issues found in testing 2017-08-31 23:15:30 -05:00
Sam
316ad132b4 Bug fixes 2017-08-31 16:08:53 +01:00
cnr
919141f2a7 Merge branch 'develop' into feature/rank-rewrite 2017-08-30 17:42:16 -05:00
Sam
9f24a0ecb9 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:46:07 +01:00
Sam
5bf0159718 Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover 2017-08-30 13:42:13 +01:00
Sam
8e65a68999 Brand new shiny NPC Manager 2017-08-30 13:38:50 +01:00
cnr
994f957bc3 Eliminate GroupPermission 2017-08-28 13:06:59 -05:00
Sam
9e7e583164 Clearup some cost constants 2017-08-28 16:23:44 +01:00
Sam
4a3e259c8a Minecart collisions 2017-08-26 21:10:58 +01:00
Sam
8e327e86b4 Huge improvement on the Cosmetic System 2017-08-26 16:14:22 +01:00
Sam
2d8bfbf31c Cleanup 2017-08-24 16:19:28 +01:00
Sam
19c65560c5 Remove rotaton on emblems 2017-08-24 11:52:04 +01:00
Sam
9a4995d212 Improve the Level Rewards system 2017-08-23 01:32:27 +01:00
Sam
5b77b099b2 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/leveling 2017-08-22 22:43:33 +01:00
Sam
a3afa48549 Remove unused imports 2017-08-22 22:22:48 +01:00