CoderTim
|
4ce537a3a7
|
Fixed some NPEs and achievement bugs
|
2014-08-25 16:27:02 -04:00 |
|
Chiss
|
0e3cf67402
|
Some new cosmetics
|
2014-08-25 12:59:29 +10:00 |
|
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 |
|
Jonathan Williams
|
fd0c4745f8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-23 00:40:17 -05:00 |
|
Jonathan Williams
|
931cb5ece8
|
Removed MineKart code.
Fixed up DisguisePlayer
Added ProfileLoader
Fixed up Notch gadget.
|
2014-08-23 00:40:07 -05:00 |
|
Chiss
|
0700b9df12
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-23 15:04:55 +10: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 |
|
Jonathan Williams
|
3a47a161c5
|
Enabled snake parkour
Updated servermanager/serverNpcPage to handle free and beta timers.
|
2014-08-22 22:53:15 -05:00 |
|
CoderTim
|
4afafe2d51
|
Some stats fixes
|
2014-08-22 21:54:08 -04:00 |
|
Jonathan Williams
|
a84468157c
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-22 18:21:38 -05:00 |
|
Jonathan Williams
|
ebb4c44bdc
|
Tweaked player disguise.
|
2014-08-22 18:21:23 -05:00 |
|
Chiss
|
e40cb17e47
|
Updated tutorial locations
|
2014-08-23 08:52:50 +10:00 |
|
Chiss
|
e5944ff872
|
Spawn location fix
|
2014-08-23 08:40:02 +10:00 |
|
Chiss
|
340be68ef8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-08-23 08:39:39 +10:00 |
|
Chiss
|
9fad775f73
|
More cosmetics
|
2014-08-23 07:50:07 +10: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
|
11597285b8
|
Changed so it music will never be 'active'.
|
2014-08-23 05:36:57 +10:00 |
|
Chiss
|
2e031f1e4a
|
Added Music Gadget
|
2014-08-23 05:35:07 +10:00 |
|
Jonathan Williams
|
b67b2f04b7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-08-22 13:32:50 -05:00 |
|
Jonathan Williams
|
13b90e1142
|
Preliminary work on help desk integration with Customer Support server.
Updated DisguiseSheep with values from craftbukkit.jar
|
2014-08-22 13:32:22 -05:00 |
|
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 |
|