Chiss
|
a159f04d50
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-23 04:30:52 +10:00 |
|
Chiss
|
231ef2bbe1
|
Cosmetic Update
|
2014-08-23 04:30:41 +10:00 |
|
Jonathan Williams
|
83b3e49151
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-22 10:48:27 -05:00 |
|
Jonathan Williams
|
70217fe957
|
Finished first release of Customer Support plugin.
|
2014-08-22 10:47:46 -05:00 |
|
Chiss
|
0022586e3e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-22 17:08:29 +10:00 |
|
Chiss
|
97c087a28d
|
Allowed commands to specify specific ranks
allowed youtube/build to start/set games
|
2014-08-22 17:05:14 +10:00 |
|
CoderTim
|
591b5c026c
|
Almost all achievements done
|
2014-08-21 18:55:40 -04:00 |
|
Jonathan Williams
|
5e47a12531
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-21 15:56:02 -05:00 |
|
Jonathan Williams
|
99d15d3ece
|
Work on Customer support server.
|
2014-08-21 15:55:09 -05:00 |
|
CoderTim
|
94f2aade08
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-21 15:01:22 -04:00 |
|
Jonathan Williams
|
1398543490
|
Fixed bug with Projectile
Changed tp out of game to 1 per tick.
|
2014-08-21 02:07:54 -05:00 |
|
Chiss
|
ac088e85b2
|
Added some game flags
Dragon escape changes
|
2014-08-21 13:35:31 +10:00 |
|
Jonathan Williams
|
830eeca835
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-20 20:14:32 -05:00 |
|
Jonathan Williams
|
315da32518
|
Removed unused code in Party
Fixed path var in Core.Common
|
2014-08-20 20:14:23 -05:00 |
|
CoderTim
|
f266f4e016
|
More achievements
|
2014-08-20 19:20:11 -04:00 |
|
Chiss
|
60869d114e
|
Dragon Escape changes
|
2014-08-20 15:45:10 +10:00 |
|
Jonathan Williams
|
217ab51b40
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-19 22:24:16 -05:00 |
|
Shaun Bennett
|
1912d2c23e
|
Update EntityPlayer with recent craftbukkit changes
|
2014-08-19 21:43:12 -05:00 |
|
Shaun Bennett
|
a7bb84be0b
|
Revert chris' revert
|
2014-08-19 21:24:49 -05:00 |
|
Shaun Bennett
|
f60a818e6a
|
Update craftbukkit to remove the extra _INVALID mappings
|
2014-08-19 21:22:04 -05:00 |
|
Chiss
|
adf617000d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-20 12:07:15 +10:00 |
|
Chiss
|
65c880b300
|
Parser changes
|
2014-08-20 12:06:24 +10:00 |
|
Jonathan Williams
|
24f984a365
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-19 21:37:11 -04:00 |
|
Jonathan Williams
|
9ee25c6292
|
Did some cleanup in Pvp project.
Did work in Coreclient manager and added StaffServer (still in progress)
|
2014-08-19 21:36:23 -04:00 |
|
CoderTim
|
18ca7d5656
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-19 21:16:44 -04:00 |
|
CoderTim
|
599277b88e
|
More work on achievements
|
2014-08-19 21:16:28 -04:00 |
|
Chiss
|
2ffcfb7737
|
Parser changes
|
2014-08-20 11:02:12 +10:00 |
|
Chiss
|
94e5eb03da
|
Fixed errors for new getPlayers method.
|
2014-08-20 10:43:56 +10:00 |
|
Chiss
|
7535f39d18
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-20 10:39:58 +10:00 |
|
Chiss
|
afea0ba87f
|
Parser Merge
|
2014-08-20 10:39:41 +10:00 |
|
CoderTim
|
09c01d90ad
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-19 19:07:37 -04:00 |
|
Shaun Bennett
|
e1a57a673e
|
Update getOnlinePlayers() to recent bukkit changes, fixes IntelliJ errors
|
2014-08-19 16:58:55 -05:00 |
|
Jonathan Williams
|
33a1699fce
|
Minor enjin tweak.
Reverted to nullable gem column because sql db wants to take forever converting.
|
2014-08-18 17:35:03 -04:00 |
|
CoderTim
|
05686cb584
|
Work on achievements
|
2014-08-18 16:41:16 -04:00 |
|
Jonathan Williams
|
d73ffcccfd
|
Added performance logging in ServerMonitor
Added date tracking for gem/coin/account transactions in preparation for Customer Support server.
|
2014-08-18 15:46:23 -04:00 |
|
Shaun Bennett
|
b99e9d3f70
|
Simplified poll system, derp
|
2014-08-18 14:15:32 -05:00 |
|
Shaun Bennett
|
36d5c2c3af
|
Don't add player's current poll to the queue
|
2014-08-17 18:11:55 -05:00 |
|
Shaun Bennett
|
34ffc06166
|
Add functionality to skip polls
|
2014-08-17 18:07:16 -05:00 |
|
Shaun Bennett
|
6e9d2b3244
|
Allow setting a time when it should poll again
|
2014-08-17 17:53:38 -05:00 |
|
Shaun Bennett
|
43fd604695
|
Queue up polls for players instead of constantly checking for next poll
|
2014-08-17 17:47:38 -05:00 |
|
Shaun Bennett
|
4ba7da9a54
|
Polls! Still needs tweaks
Hub artifact stuff for IntelliJ
|
2014-08-17 17:30:35 -05:00 |
|
Shaun Bennett
|
e5340238b6
|
IntelliJ Hub Configurations
|
2014-08-17 13:57:20 -05:00 |
|
Shaun Bennett
|
6793deffd0
|
Copy Command
Small Fixes
Single Imports IntellIJ config
|
2014-08-16 20:17:21 -05:00 |
|
Shaun Bennett
|
b6c31294c7
|
Parse map properly, bug fixes
|
2014-08-16 16:19:33 -05:00 |
|
Shaun Bennett
|
e286a45de8
|
Code cleanup for spawn location, remove JoinCommand
|
2014-08-16 16:01:00 -05:00 |
|
Shaun Bennett
|
18e1265afd
|
Remove join list, adjust intellij import style to be more like eclipse
|
2014-08-16 15:55:29 -05:00 |
|
Shaun Bennett
|
eac0f9fd6a
|
MapParser refactoring/changes
|
2014-08-16 15:50:33 -05:00 |
|
Shaun Bennett
|
4193ee53ea
|
Merge remote-tracking branch 'origin/master'
|
2014-08-16 12:13:11 -05:00 |
|
Shaun Bennett
|
ef6871491d
|
Add MapParser IntellIj configurations
|
2014-08-16 12:12:59 -05:00 |
|
Jonathan Williams
|
8aec9e345e
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-16 01:37:17 -05:00 |
|