Chiss
|
13eb3da0fa
|
Achievment gui changes
|
2014-08-25 09:26:01 +10:00 |
|
Chiss
|
7669998ad3
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-25 08:38:29 +10:00 |
|
Shaun Bennett
|
ff441f2262
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
|
2014-08-24 16:14:29 -05:00 |
|
Shaun Bennett
|
2cb87b23e6
|
Stat Gui, Start of Treasure Gui (disabled)
|
2014-08-24 16:08:19 -05:00 |
|
Chiss
|
23f6d0ae1a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-24 16:46:00 +10:00 |
|
Chiss
|
3f5cff3e21
|
Killing cheaters for a few things in bridges
|
2014-08-24 16:45:47 +10:00 |
|
CoderTim
|
c89461628b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-23 16:00:26 -04:00 |
|
CoderTim
|
fb90336d4e
|
Finished stats/achievements
|
2014-08-23 16:00:15 -04:00 |
|
Chiss
|
642f8b46b9
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-23 18:01:35 +10:00 |
|
Chiss
|
7348a26951
|
fixed damage dealt npe
|
2014-08-23 18:00:23 +10:00 |
|
Chiss
|
af9bf0727a
|
Fixed damage taken stat NPE
Added tournament team auto-rejoin
|
2014-08-23 17:55:28 +10:00 |
|
Jonathan Williams
|
70beb58bd6
|
Enabled debugging in Hub/Arcade
|
2014-08-23 01:49:48 -05:00 |
|
Chiss
|
3ec43f90e8
|
GameAchievementManager now utilises TaskManager to record whether or not people have previously completed Achievements
|
2014-08-23 15:04:43 +10:00 |
|
CoderTim
|
4afafe2d51
|
Some stats fixes
|
2014-08-22 21:54:08 -04:00 |
|
CoderTim
|
b2b208bdba
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-22 17:30:08 -04:00 |
|
CoderTim
|
02bb53578a
|
Registered stat listeners with each game
|
2014-08-22 17:20:02 -04:00 |
|
Chiss
|
231ef2bbe1
|
Cosmetic Update
|
2014-08-23 04:30:41 +10: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 |
|
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 |
|
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 |
|
Shaun Bennett
|
a7bb84be0b
|
Revert chris' revert
|
2014-08-19 21:24:49 -05: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
|
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 |
|
CoderTim
|
05686cb584
|
Work on achievements
|
2014-08-18 16:41:16 -04:00 |
|
Chiss
|
d8123795aa
|
changed the way disguises show rank.
|
2014-08-16 16:33:18 +10:00 |
|
Chiss
|
508ef65fcf
|
Added missing file
|
2014-08-16 14:17:15 +10:00 |
|
CoderTim
|
19222c6815
|
Updated IntelliJ environment to be compatible with latest changes
|
2014-08-15 15:51:29 -04:00 |
|
Chiss
|
29db90837d
|
Spleef Update
Map parser block stuff
|
2014-08-15 15:28:50 +10:00 |
|
Chiss
|
85522cddca
|
Debug (will clean once fixed)
Game stats
|
2014-08-15 09:49:00 +10:00 |
|
Chiss
|
74435bac12
|
fixed bug where players kept inventory open, to be able to enable morphs ingame.
|
2014-08-14 17:31:14 +10:00 |
|
Chiss
|
5f80d9c57a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
|
2014-08-14 11:24:51 +10:00 |
|
Chiss
|
b6ba142c5a
|
Mineplex in scoreboard is fancier.
|
2014-08-14 11:23:48 +10:00 |
|
Shaun Bennett
|
b9534bd245
|
Merge remote-tracking branch 'origin/master'
|
2014-08-13 20:07:01 -05:00 |
|
Shaun Bennett
|
cfe45139b6
|
Adjust lobby text for the removal of premium kits
|
2014-08-13 19:56:47 -05:00 |
|
Shaun Bennett
|
83f04273fa
|
Sort kits properly when a game uses NullKit
|
2014-08-13 19:45:38 -05:00 |
|
Chiss
|
b21ae8ef72
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-14 10:32:52 +10:00 |
|
Chiss
|
7a3bba45a7
|
Mergey!
|
2014-08-14 10:32:41 +10:00 |
|
Jonathan Williams
|
6039168601
|
Updated code base to build #1604 spigot
|
2014-08-13 18:57:37 -05:00 |
|
Chiss
|
95394c51cc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-12 11:24:12 +10:00 |
|