JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,014 Commits 1 Branch 0 Tags 481 MiB
0c5ec503be
Commit Graph

981 Commits

Author SHA1 Message Date
CoderTim
9acc7d8496 Added team kill and death achievement trackers 2014-08-25 17:43:49 -04:00
CoderTim
4ce537a3a7 Fixed some NPEs and achievement bugs 2014-08-25 16:27:02 -04: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
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
Shaun Bennett
f60a818e6a Update craftbukkit to remove the extra _INVALID mappings 2014-08-19 21:22:04 -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
Chiss
2d67d4ce36 Achievement fix + active 2014-08-12 11:23:53 +10:00
Shaun Bennett
d63137ead2 Merge remote-tracking branch 'origin/master' 2014-08-11 12:44:28 -05:00
Shaun Bennett
7e93ed657f Display boss bar properly while a dragon mount is spawned in arcade 2014-08-11 12:26:56 -05:00
Chiss
02270a9d25 TNT effect only triggers off self tnt. 2014-08-11 15:33:45 +10:00
Chiss
7191d48bd0 fixed paintball pre-game bug 2014-08-11 14:25:11 +10:00
Chiss
e4871c4988 Disabling cosmetics 5s before game starts, was having some carryover due to lag. 2014-08-11 11:55:00 +10:00
Chiss
d81b32bd3a Sneaky Assassins balance+polish 2014-08-10 21:05:41 +10:00
Chiss
06bcf5079b Disabled Gem hunter (bugged?) 
Disabled chicken morph letting people fly
 2014-08-10 18:36:18 +10:00
Chiss
25b525837f Fixed TNT blowing up lobby when it changed to prepare. 2014-08-10 11:07:05 +10:00
Chiss
9057246ab8 Arcade Inventory fixes 2014-08-10 10:50:31 +10:00
Chiss
3533ce1b7e Particles dont play in stealth games. 2014-08-10 01:04:53 +10:00
Chiss
616a0ecf11 Staff get all kits unlocked. 2014-08-10 00:32:50 +10:00
Chiss
38fd85335f Fixes disguises being disabled. 2014-08-10 00:21:45 +10:00
Chiss
62cc422f42 FINAL FIX 2014-08-10 00:13:04 +10:00
Chiss
c95cf79aa6 fxied more 2014-08-10 00:10:08 +10:00
Chiss
a43a5b2c0e bacon brawl fix 
signel game ultra shows in hub scoreboard
 2014-08-10 00:09:39 +10:00
Chiss
3d1ddecffb Smash Kit fix 
Gem Booster (dragons) fix
 2014-08-09 23:25:13 +10:00
Chiss
cac7f85410 Single game ultra kit unlock 2014-08-09 23:10:40 +10:00
Chiss
23f93e55cf fixed dragons destroying pregame lobby 2014-08-09 22:59:54 +10:00
Chiss
ff6ea3c798 Added Cosmetics to Arcade 
Set prices on cosmetics
 2014-08-09 19:55:05 +10:00
Jonathan Williams
8fe4e39207 Split up Cosmetic shop and Inventory 
Added Ammo purchase for item gadgets.
 2014-08-09 03:57:56 -05:00
Chiss
91a79f0345 Pig Morph 
Morphs have tags/
 2014-08-09 14:57:01 +10:00
Chiss
fb19e93992 Gem text 2014-08-09 13:46:41 +10:00
Chiss
c93a49add2 More gem boosty! 2014-08-09 13:42:29 +10:00
Chiss
2e95548b6e Gem Boosters! 2014-08-09 13:39:57 +10:00
Chiss
3a220b6f1c Micro Update 
SGTeams inv click fix.
 2014-08-09 13:11:32 +10:00
Jonathan Williams
6bd9273edf Refactored getting item count for ClientInventory 
Fixed up Arcade gem boosters so they are hooked into inventory.
Cleaned up unused code.
 2014-08-08 22:10:02 -05:00
Chiss
313f675ae4 Hub Parkour update 
Smash kit prices
 2014-08-09 12:16:37 +10:00
Chiss
b36b1cb007 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-08 17:05:23 +10:00
Chiss
fa3695be4e Gem Booster In Lobby 
Achievement Stuff
 2014-08-08 17:05:11 +10:00
Shaun Bennett
9395711dcb Merge remote-tracking branch 'origin/master' 2014-08-08 01:51:50 -05:00
Shaun Bennett
b7ecf5eb04 GET MINEPLEX ULTRA FOR AMAZING FUN TIMES 2014-08-08 01:51:11 -05:00
Chiss
1a33dbb5ee Achievement Module 
Gem Booster/Achivement
 2014-08-08 13:46:35 +10:00
Shaun Bennett
2fd7621a81 Display proper team in Arcade Lobby (Fixes bug where a player connecting will break scoreboards) 2014-08-07 18:44:27 -05:00
Jonathan Williams
c01fbd279d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/gadget/GadgetManager.java
 2014-08-07 00:48:32 -07:00
Jonathan Williams
6d86f403ac Added coins Currency to web api 
Added coins purchase for all cosmetic items
Added Stats manager
Added Inventory Manager

Redesigned gadgets/morph/particle/pets/mounts page and inventory.
 2014-08-07 00:33:24 -07:00
CoderTim
8a74b08b0d Fixed silly mistake I made 2014-08-06 23:59:52 -04:00
CoderTim
f7f9d3e703 Sneaky assassin power-up maximum is 5 and hanging entities cannot be damaged 2014-08-06 21:35:11 -04:00
Chiss
c647e6b48d Missing morphs 
Bacon brawl knockback increase over time
Parse color error fix
 2014-08-07 09:47:11 +10:00
Chiss
a737aa8624 Game desc 2014-08-06 19:16:17 +10:00
Chiss
c4768a8a9c Smokebomb doesnt end instantly :o 2014-08-06 19:13:25 +10:00
Chiss
f68586cca4 Micro Battle 2014-08-06 19:00:18 +10:00
Chiss
248111749f Sneaky Changes 2014-08-06 17:14:07 +10:00
CoderTim
bea6eabb95 Sneaky Assassins: Revealed players have wither effect. Fireworks are yellow. Additional announce messages 2014-08-06 01:41:50 -04:00
CoderTim
16353c4bc9 Changes to Sneaky Assassin power-ups, including addition of compass power-up. 2014-08-06 01:23:06 -04:00
Chiss
9e047847c2 scoreboard fix 2014-08-06 12:42:07 +10:00
Chiss
4108a02f50 Sneaky scoreboard order 2014-08-06 12:37:41 +10:00
Chiss
a0010668c6 Sneaky Assassins changes 2014-08-06 12:23:02 +10:00
Chiss
f09506e436 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/SneakyAssassins.java
 2014-08-06 11:09:16 +10:00
Chiss
c8dfb2f02e Parser Fixes 
Sneaky Stuff
 2014-08-06 11:07:49 +10:00
CoderTim
3ee0b271b6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-05 01:23:37 -04:00
CoderTim
0240d50029 Sneaky Assassins Changes: 
- when you get a kill, give an armor upgrade and 1 smoke bomb
 - Revealer range increased to 12 blocks
 - NPC dies once every 2 seconds
 - Lose 1 hunger every second. Gain 8 when damaging player or NPC
 - Reveal all players every 60 seconds, for 2 seconds
 - Added cloaking back to smoke bomb
 - Power-up is always green and type alternates per player. Power-ups always include smoke bomb and mushroom soup.
 - NPC speed slightly decreased
 - Corrected sword power-up progression
 2014-08-05 01:23:24 -04:00
Shaun Bennett
e8d14e9fbf Remove created by comment 2014-08-04 00:33:34 -05:00
Shaun Bennett
1c5b3919e1 Merge remote-tracking branch 'origin/master' 2014-08-04 00:31:56 -05:00
Shaun Bennett
0edb0d74a7 Fix bugs with kit sorting + cost of kits 2014-08-04 00:31:46 -05:00
CoderTim
e7d3cf9e02 Sneaky Assassins previous commit bug fix 2014-08-04 01:06:11 -04:00
CoderTim
012382ec48 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 01:02:27 -04:00
CoderTim
8a727e1365 Smarter Sneaky Assassins AI 2014-08-04 01:02:05 -04:00
Shaun Bennett
e4662ab563 Update my SneakyAssassinKit change to work with Tim's changes 2014-08-03 23:41:54 -05:00
Shaun Bennett
34dfe8dacd Merge remote-tracking branch 'origin/master' 2014-08-03 23:32:37 -05:00
Shaun Bennett
fe32cf5444 Remove KitAvailability.Blue 2014-08-03 23:31:55 -05:00
CoderTim
39e23c16f0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-08-04 00:00:12 -04:00
CoderTim
482f48f994 Prevent players in Sneaky Assassins from breaking paintings and item frames 2014-08-04 00:00:04 -04:00
CoderTim
ec48a59301 Added option DISGUISE_TYPE:<ENTITY_TYPE> in WorldConfig.dat for Sneaky Assassins to configure which entity players are disguised as. 2014-08-03 23:59:10 -04:00
Shaun Bennett
35b16e026c Blue kits cost gems instead of being premium kits 2014-08-03 22:44:01 -05:00
Chiss
07fe476fd3 fix for stuff that jon broke 2014-08-01 17:45:22 +10:00
Chiss
b6fe33e6fb Ultra/hero gems removed 2014-08-01 17:03:07 +10:00
Chiss
0f9e72d623 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-08-01 14:06:13 +10:00
Chiss
599a6eb1f7 Changed kit availability to be based on free/premium. 2014-08-01 14:05:53 +10:00
CoderTim
c36242cc47 Added stained glass around power-up beacon base in sneaky assassins to identify power-up more easily. 
Added workaround to make revealer fireworks explode consistently
Power-ups use UtilPlayer.message and have a sound effect is player when a power-up is aqcuired
Power-up bug fixes
 2014-07-31 23:35:50 -04:00
CoderTim
6ac00cde99 Move Sneaky Assassins NPCs during Prepare and Live 2014-07-31 23:32:26 -04:00
CoderTim
22748eb225 Updated KitRevealer description 2014-07-31 23:31:42 -04:00
CoderTim
77b6f0250e Play zombie_unfect sound when PerkRevealer explodes 
PerkSmokeBomb also applies effects to NPCs
PerkSmokeBomb now uses HUGE_EXPLOSION effect
Set Sneaky Assassins PrepareFreeze flag to false
 2014-07-30 23:56:40 -04:00
Chiss
308c2e1b91 Kit availability 2014-07-31 13:00:05 +10:00
Chiss
a4d579789c Sneaky Assassins changes :) 2014-07-31 12:58:33 +10:00
Jonathan Williams
4d397438be Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 21:11:15 -07:00
CoderTim
0382afecd8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-29 20:24:04 -04:00
CoderTim
fa91bf0a00 Disable dropping hunger in Sneaky Assassins 2014-07-29 20:22:46 -04:00
Jonathan Williams
46cc2576dd Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-26 10:41:04 -07:00
Jonathan Williams
4e1a05e9bd Fixed whitelist issue with tournament mode. 2014-07-26 10:40:49 -07:00
Chiss
78b3d3b35c restored original bridge timer :) 2014-07-26 21:05:12 +10:00
Chiss
3f4e4b6607 fixed -1 not working 2014-07-26 21:03:50 +10:00
Chiss
802415be8f -1 team kills for suicide (only after bridge drop) 2014-07-26 20:57:40 +10:00
Chiss
f090ed9313 end game fixes 2014-07-26 20:53:48 +10:00
Chiss
4f46ccc8aa Winner is decided on bridge tourney timeout 2014-07-26 20:29:01 +10:00
Chiss
fa73ab5335 Bridges Tourney stuff 2014-07-26 17:40:17 +10:00
Chiss
21314afabe Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-26 17:03:30 +10:00
Chiss
107388baa3 Added game flag to allow clicking in inventory during games 2014-07-26 17:03:03 +10:00
Jonathan Williams
a455042c07 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-25 23:38:38 -07:00
Jonathan Williams
12b42cad29 Made tournament changes: 
Staff can't see team chat
Bridge tournament time is 90 min
Kits are not all free
Removed twitch charity text/motd
If team not picked, you go to spec.
 2014-07-25 23:38:21 -07:00
CoderTim
fe46355130 Added missing description to Sneak Assassin revealer items 2014-07-24 21:25:59 -04:00
CoderTim
fe356add41 Restore original blocks when Sneaky Assassin power-up beacon is removed 2014-07-23 15:45:30 -04:00
CoderTim
a6a274069c Prevent power-up message spam when player is fully powered-up 2014-07-21 17:26:45 -04:00
CoderTim
4460f2e651 Prevent fully powered-up Sneaky Assassin players from using additional power-ups 2014-07-21 16:29:15 -04:00
CoderTim
efa74f509a Fixed bug where revealer doesn't always work 
Prevent players from trading with sneaky assassin npcs
Display message when user powers up
 2014-07-18 02:48:06 -04:00
CoderTim
64feaf63ed Implemented Sneaky Assassin Revealer kit 2014-07-15 00:36:38 -04:00
CoderTim
c547801b7b Added Sneaky Assassin NPC movement 2014-07-11 22:55:48 -04:00
CoderTim
b15534e1b2 Some work on Sneak Assassins NPCs 
Added /game start <seconds> to start a game faster
Optimized GameTeam.GetSpawn() by avoiding unnecessary square root calculations
 2014-07-11 00:56:25 -04:00
Mini-Chiss
bd6b9b8888 so many fix 2014-07-08 17:35:27 -07:00
Mini-Chiss
c5e05523d3 sneakyfix 2014-07-08 17:34:47 -07:00
Mini-Chiss
dd0040086d Parser Permissions 
Sneaky Assasssin thingy.
 2014-07-08 17:33:22 -07:00
Mini-Chiss
1455b4001f Parser Update 2014-07-08 15:13:30 -07:00
Jonathan Williams
963c71f128 Fixed internet status stuff for bungees. 
Fixed new portal arg req.
 2014-07-08 12:44:17 -07:00
Mini-Chiss
cf25bdc44f Bridges fix being able to break mid chests before gamestart 
Map parser Updates
 2014-07-07 19:04:44 -07:00
Mini-Chiss
ef86fe6948 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-07 16:24:43 -07:00
Mini-Chiss
62f6ea815d Champs Balance Update 
Map Parser Update
 2014-07-07 16:23:55 -07:00
CoderTim
38e4240a61 Fully implemented Sneaky Assassins Power-Ups 2014-07-07 19:10:29 -04:00
CoderTim
fe1bf95342 Fixed code style and updated IntelliJ code style settings 2014-07-07 14:45:02 -04:00
Mini-Chiss
df8562e69a Tourney mode for UHC 2014-07-04 23:11:13 -07:00
Mini-Chiss
c65712c260 UHC fixes 
Sneaky Assassin listener leak fix
Some map parser stuffs.
 2014-07-04 23:04:46 -07:00
CoderTim
6365ec5351 Started on Sneaky Assassins kits and power-ups 2014-07-04 11:14:34 -04:00
CoderTim
2fb2aadf66 Merge remote-tracking branch 'origin/master' 2014-07-04 11:12:52 -04:00
CoderTim
46c979e088 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-04 11:12:33 -04:00
Mini-Chiss
d19b34b0e4 Removed debug 2014-07-02 17:14:52 -07:00
Mini-Chiss
22ceba9841 Fixed Scoreboards! 2014-07-02 17:12:52 -07:00
Jonathan Williams
d0fafce585 Reverted change to helper only joining full, now ultras can. 
Added check so BETA servers cannot be joined by less than Helper.

Fixed message in AccountAdministrator for rankUpdate
 2014-07-02 16:59:31 -07:00
Jonathan Williams
8eaad57516 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-02 16:05:37 -07:00
Jonathan Williams
f1393ffb33 Fixed rankUpdate changing existing higher ranked players. 
Fixed join limits in arcade and hub.
 2014-07-02 16:05:26 -07:00
Mini-Chiss
bea6902198 Spectators can use /tp 2014-07-02 13:09:47 -07:00
Mini-Chiss
82dd94de9b Scoreboard fix 
Unbreakable boats in hub
 2014-07-02 12:50:04 -07:00
Mini-Chiss
05e116ea0d Scoreboard flicker fixed! 2014-07-02 12:38:41 -07:00
Mini-Chiss
558f79fe34 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-07-02 10:58:34 -07:00
Mini-Chiss
17c36026f6 fixed bug where player who comes first was not being added to ranks. (get nothing) 2014-07-02 10:57:30 -07:00
Peter Miller
6c67ff9106 Resolving issues from Portal.java conflict resolution 2014-07-02 04:09:41 -04:00
Jonathan Williams
9514f6391e Fixed bug in Arcade with client manager. 2014-07-01 21:42:00 -07:00
CoderTim
44a57a485f Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 21:39:03 -04:00
Jonathan Williams
081260757d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 18:31:26 -07:00
Mini-Chiss
31772196a9 More scoreboard stuff (TDM) 
New Tug game
 2014-07-01 18:30:04 -07:00
Jonathan Williams
b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams
9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
CoderTim
7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss
8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
CoderTim
ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Mini-Chiss
f10b081473 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-26 18:38:28 -07:00
Mini-Chiss
3d12196b17 Merge 
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
 2014-06-26 18:38:11 -07:00
Jonathan Williams
f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams
4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Mini-Chiss
46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams
f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams
6cac04d399 Optimized create scoreboards. 2014-06-19 00:48:04 -07:00
Jonathan Williams
231ffd7234 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 17:21:47 -07:00
Jonathan Williams
93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Chiss
c386023a6f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-16 10:18:30 +10:00
Chiss
fd17c1b254 More staggered teleports on game end 
Logging teleports.
 2014-06-16 10:18:10 +10:00
Jonathan Williams
6515dd13a0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 16:25:40 -07:00
Jonathan Williams
0f7885d911 Added safety checks in ClientManager 
Added logging and teampreference swap fix in arcade.
 2014-06-15 16:25:32 -07:00
Chiss
a756bb88a2 NPE log 2014-06-16 09:25:14 +10:00
Chiss
9a79d0ede7 Fixed CME 
Gadget cost fix
MapParser fix
 2014-06-15 15:10:19 +10:00
Chiss
d5c96f95c0 Fixed bug that gave items while respawning. 2014-06-15 12:01:58 +10:00
Jonathan Williams
be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Chiss
661a869116 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-10 13:02:17 +10:00
Chiss
7fc2fbe564 Scoreboard Refactor 2014-06-10 12:51:47 +10:00
Chiss
6cba6b9b9e merge 2014-06-10 10:27:25 +10:00
Jonathan Williams
3ae119d88a Fixed hub package unlock bug. 
Fixed Champions build page open bug.

MOved some code around because i'm a boss.
 2014-06-08 11:27:14 -05:00
Chiss
967ff44d0a gamecreation fix 2014-06-05 10:15:22 +10:00
Chiss
644f946f69 error debug 2014-06-04 17:56:21 +10:00
Chiss
4c72651f86 game creation 2014-06-04 17:55:13 +10:00
Chiss
1d549e38ff Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-30 15:02:22 +10:00
Chiss
d4465fd8f2 merge 2014-05-30 15:01:08 +10:00
CoderTim
1b5b2d21b2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-28 17:51:38 -04:00
Jonathan Williams
48975d02c7 Adding some missing files for website. 2014-05-28 11:20:13 -07:00
CoderTim
94e31e36f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-27 21:42:01 -04:00
CoderTim
e101c027ce Created Sneaky Assassins and started work on the kits 2014-05-27 21:38:22 -04:00
Jonathan Williams
449fa13cc3 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	.gitignore
 2014-05-27 02:23:22 -07:00
Jonathan Williams
0634ee5543 Removed unused global stuff in Mineplexer. 
Did some edits in GroupManager...need to pick that up.

Changed TimeUtil to pop last entry when stopping.
Fixed WorldUtil's dimension thing for UHC.
Fixed Exception with AntihackRepository and no static lock object on _connection

Work on Elo manager.
Work on Queue.

Added checking for player to server transfer records.

Added option for rejoin time in TeamGame (UHC...yay)
 2014-05-27 02:10:29 -07:00
CoderTim
49de140f41 Configured eclipse to use UTF-8 2014-05-25 21:04:14 -04:00
CoderTim
c45e7d2a80 Converted file encoding from ISO-8859-1 to UTF-8 2014-05-25 19:42:39 -04:00
CoderTim
3859a42f1d Removed broken and obsolete shifter code 
Set up more intellij stuff
 2014-05-25 19:11:58 -04:00
CoderTim
aa6b5324eb Set up IntelliJ IDEA 2014-05-20 00:39:50 -04:00
Jonathan Williams
6d19c80af2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 22:15:55 -05:00
Jonathan Williams
6af5d9205b Added TimeUtil.java 
Removed double gems.

Removed extra world uninitialize.

Changed AccountAdministrator to use UUID.
 2014-05-13 22:13:48 -05:00
Chiss
002260dce8 better date 2014-05-14 12:57:43 +10:00
Jonathan Williams
12041b0d72 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 21:54:58 -05:00
Chiss
8ea344cacd fixed a NPE 2014-05-14 12:38:06 +10:00
Jonathan Williams
40ba1a64f8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-13 14:46:15 -05:00
Chiss
fbb0031dc1 fixed bug in dom where endCheck was being called multiple times 
logging for world stuff
 2014-05-13 11:18:17 +10:00
Jonathan Williams
b1514fef5a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-09 21:18:48 -07:00
Jonathan Williams
0ec08d5208 Fixed chunk load outside borders (disabled for testing right now) 2014-05-09 21:18:38 -07:00
Chiss
208a78b070 respawning players are tp'd if leave area. 2014-05-10 14:01:02 +10:00
Chiss
d9225c003e CS Update 2014-05-10 09:55:27 +10:00
Jonathan Williams
eae2d41fad Fixed party out of bounds exception. 
Fixed tnt in wrong place in dom shop.
 2014-05-08 20:01:21 -07:00
Jonathan Williams
b72bcadbf4 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 22:38:50 -07:00
Jonathan Williams
ebf40afe75 Fix dom bow shoot in lobby bug. 
Work on preventing illegal builds.
 2014-05-06 22:38:27 -07:00
Peter Miller
e0dd0116a2 Beginning changes for stats from PlayerName to PlayerUUID 2014-05-06 17:06:19 -04:00
Jonathan Williams
5f2b2c251d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-06 09:06:49 -07:00
Jonathan Williams
8110506ac4 Fixed duplicate login issue with CoreClientManager 
Added EloRanking and EloStart for elo games in Game.java

Refactored Elo code in Arcade to be based off of above values in Game

Changed Lobby scoreboard in Arcade to just Players at top current/max.
 2014-05-06 09:06:39 -07:00
Chiss
f79b3b147c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-05-06 15:59:20 +10:00
Chiss
223da7bf4d ResetAll for class skills 2014-05-06 15:55:14 +10:00
Jonathan Williams
2f397e7d2a Work on elo manager. 
implemented coreclient cleanup.
 2014-05-04 22:40:44 -07:00
Jonathan Williams
f079333d3b Optimized ChunkBlockChange. 
Still no dead chunks!

Fixed LobbyManager advertising to an empty lobby.
 2014-05-04 18:29:19 -07:00
Jonathan Williams
97e083c1e7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-04 12:52:14 -07:00
Jonathan Williams
f623026dfc Fixed projectile order issue..check for dead before collision. 
Fixed dead chunks in Aracde.
 2014-05-04 12:52:04 -07:00
Chiss
6e8bdfa769 disabled hub clock for tournament 2014-05-03 17:26:21 +10:00
Chiss
0ce3b3fb2d Disabled AFK kick during Tournament 2014-05-03 17:23:10 +10:00
Jonathan Williams
fe7ed5c96a Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-05-02 23:19:05 -07:00
Chiss
b432c094d9 Misisng ifles 2014-05-03 16:16:52 +10:00
Jonathan Williams
0101531291 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2014-05-02 23:15:08 -07:00
Jonathan Williams
484ba97b23 Updated file delete mechanism so there is no reflection. 
Removed list block on deleting players from coreclient quit.
 2014-05-02 23:12:39 -07:00
Chiss
4304327bf9 Disallowed /spec during games. 2014-05-03 13:06:15 +10:00
Chiss
395a5d2c08 MAC disabled with Tournament Mode 
Bridges TM game desc fix
 2014-05-03 11:47:15 +10:00
Chiss
e818662161 Added /spec toggle, to allow players to not partake in games. 
Added TeamArmorAddon for games to use, to mark team colors easier.
Minor other changes.
 2014-05-03 11:23:10 +10:00
Chiss
1d4d98b910 Twitch Prep 
MAC changes
 2014-05-02 14:35:41 +10:00
Chiss
8240101d60 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
 2014-05-01 09:33:59 +10:00
Chiss
423a355057 Helpers+ wont be kicked yb MAC 2014-05-01 09:31:47 +10:00
Jonathan Williams
f4a92ec07a Implemented Logger 
Logger now catches all uncaught exceptions and logs them to DB.

Put in some preventative checks in Hub/Party as they threw a lot of the same errors.

Added autoreconnect to AntiHack as it was spamming errors in DB
 2014-04-30 10:57:19 -07:00
Jonathan Williams
7637d94ae0 Added mysql logger. 
Hooked it up in a few places.

Fixed Asynch crap with AntiHack.
 2014-04-30 00:31:22 -07:00
Jonathan Williams
e958a922fe Fixed Hub chat so it goes through filter. 
Added back in server name so it tracks correctly.

Fixed PlayerCount in Mineplexer AGAIN.
 2014-04-29 12:53:22 -07:00
Jonathan Williams
3ec1653532 Added in chat filtering command and finished up filtration. 2014-04-29 11:54:20 -07:00
Jonathan Williams
66aa7223cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-27 21:59:35 -07:00
Jonathan Williams
47417dea6b Implemented initial SafeChat. 2014-04-27 21:59:18 -07:00
Chiss
dc6a3da0fa Added more DMT words 2014-04-28 14:08:40 +10:00
Chiss
77809b409d MAC Update 2014-04-28 12:28:48 +10:00
Chiss
40ef432211 Cannot use skills/items in HubManager 
Dom CP score rate lowered
Dom items dont use energy
 2014-04-28 09:41:00 +10:00
Chiss
82afefd11a Quick fix for respawning players not being able to get stuff from creative inventory 2014-04-27 01:09:25 +10:00
Chiss
95d6ec7f50 Barrage fix 2014-04-26 17:25:35 +10:00
Chiss
b86b014058 Fixed a whole bunch of bugs 2014-04-26 11:59:11 +10:00
Jonathan Williams
ac1c081bc8 Fixed scoreboard issues. 2014-04-25 17:52:04 -07:00
Jonathan Williams
a37ace7576 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-25 00:44:27 -07:00
Jonathan Williams
9136fa0b15 Upgraded to latest spigot. 
Fixed npcs being so loud.
Npcs are now ghosted automatically.

Added UUID on login.
 2014-04-25 00:44:14 -07:00
Chiss
9495630bf2 CP rate increase 2014-04-25 11:10:37 +10:00
Jonathan Williams
7fef4adbee Fixed resupply resetting skills. 2014-04-22 22:19:03 -07:00
Chiss
7ea601e94b Cant open bridge chests until bridges are down. 2014-04-23 10:38:59 +10:00
Chiss
0325892e2a Champs water fixes 
First push for Twitch games
 2014-04-23 10:21:01 +10:00
Jonathan Williams
e62dfb0dd2 Fix skill/item packs not deducting gems. 
Fix players not getting spectating flag when dying.
 2014-04-22 16:50:44 -07:00
Chiss
bddc36271d fixed gems for capture 2014-04-21 17:16:35 +10:00
Chiss
0f31052d00 cannot shoot arrow in water. 
less gems for capping
 2014-04-21 17:14:23 +10:00
Chiss
a150249f4f game will not announce winner multiple times 2014-04-21 17:01:50 +10:00
Chiss
adf8821a26 more CP changes 2014-04-21 12:55:24 +10:00
Chiss
b1e082b73a fixed riposte bug 
tweaked capture effects
 2014-04-21 11:56:14 +10:00
Chiss
0eaa3110f5 Risposte nerf 2014-04-21 11:18:14 +10:00
Chiss
b8e573e8f8 redid capture display. much less annoying. 2014-04-21 11:15:49 +10:00
Chiss
07098b0b82 fixed no damage on weapons 
items not usable until game is live
fixed proxies not triggering
some skill balance/fixes
players with null kit are now given default knight
 2014-04-21 10:48:04 +10:00
Chiss
ddc8e435e8 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java
 2014-04-21 08:49:13 +10:00
Chiss
3281eb2ed7 Merge 2014-04-21 08:47:07 +10:00
Jonathan Williams
1f225f05ff Custom build fixes. 2014-04-20 00:27:32 -07:00
Jonathan Williams
dc625726c4 Item Custom Build Fixes. 2014-04-19 22:54:52 -07:00
Jonathan Williams
458f5741d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-19 20:54:04 -07:00
Jonathan Williams
e5e9cc7284 Custom Items in custom Builds for dom. 2014-04-19 20:53:55 -07:00
Chiss
845d45bd4d fixed some skill bugs 
players quitting during recruit will no longer remain on a team, caused unbalance
GiveClock flag added to game, to stop giving clock.
 2014-04-20 13:50:15 +10:00
Chiss
de2b42e190 fixed tnt bug 2014-04-19 15:18:13 +10:00
Chiss
b720a6433c Explosions crack carved stone brick 2014-04-19 15:10:30 +10:00
Chiss
1bf1f04d53 Champs Stuff 2014-04-19 14:50:14 +10:00
Chiss
424f915388 Champs Merge 2014-04-18 13:24:30 +10:00
Chiss
5ac48a02fb Stripped indicator func out of Condition 
Class Combat skills arent usable before game starts
Silence re-enabled for class combat skills
 2014-04-15 17:53:24 +10:00
Chiss
e5ea7483db Merge 2014-04-14 09:27:31 +10:00
Chiss
5df8d34426 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Class/ClientClass.java
 2014-04-13 18:01:55 +10:00
Chiss
9874dae60f Merge 2014-04-13 18:00:53 +10:00
Jonathan Williams
5efaf9bd36 Fixed inf loop. 2014-04-13 00:59:55 -07:00
Chiss
85aa748218 Champs Bug Fixes 2014-04-13 17:20:49 +10:00
Chiss
f25a6c26c9 Champs Update 2014-04-13 11:06:10 +10:00
Chiss
154479d1b7 Fixed TDM health 2014-04-13 09:29:22 +10:00
Chiss
f73d4d3e23 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-13 09:29:12 +10:00
Chiss
2e4bc587b1 Champs Update 2014-04-13 09:26:31 +10:00
Jonathan Williams
98430be09e Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-12 01:45:01 -07:00
Jonathan Williams
8f42d91d8a Fixed ban kick bug. 
Fixed Hub right click mount crash bug.
Fix for custom builds not saving.
Fixed Bridges not starting/hanging.

Updated to 1.7.8 spigot support.

Removed logging on HS.
 2014-04-12 01:28:33 -07:00
Chiss
ecc40bda47 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-12 18:25:59 +10:00
Chiss
ba1c6ae35f Champs Balance 2014-04-12 18:22:53 +10:00
Jonathan Williams
eb1d1c1ed2 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-11 03:10:02 -07:00
Jonathan Williams
c8af89dded Fixed BH and GRavity. 2014-04-11 03:09:21 -07:00
Chiss
80df2c2944 Bux fixes for 1.7 
Champions TDM
SSM Domination
 2014-04-11 15:33:31 +10:00
Chiss
71b2931936 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-11 10:34:51 +10:00
Chiss
2adf0395a1 Merge 2014-04-11 10:33:56 +10:00
Jonathan Williams
0375384fb5 Converted to Spigot's latest 1.7.5 2014-04-10 17:15:44 -07:00
Chiss
b64acf524c Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-04-09 19:07:22 +10:00
Chiss
b868db0f22 Fixed so you can now charge bow skills in air. 2014-04-09 19:07:12 +10:00
Jonathan Williams
e4ca9084cc Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-09 02:03:41 -07:00
Jonathan Williams
ec29c66d1c Added arrows sticking in you. 
Removed bouncing arrows.
 2014-04-09 02:03:19 -07:00
Chiss
146202a52c Champs Balance + Red Arrow Fix 2014-04-09 18:50:38 +10:00
Chiss
0ecd38c656 Champs Balance 2014-04-09 16:48:01 +10:00
Jonathan Williams
bedabd84cc Added silence to kits (UtilEnt.silence) 
Cleaned up a ton of unused code....
 2014-04-08 23:31:32 -07:00
Chiss
2eaaa85e04 Fixed /game stop trapping players in dead world. 2014-04-08 12:08:59 +10:00
Chiss
bb3f2c6281 CHAMPS 2014-04-08 10:53:41 +10:00
Chiss
85c57f2942 IButton now has Left/Right 
Added right-click skill removal.
 2014-04-06 12:45:52 +10:00
Jonathan Williams
88131836d7 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-04-05 16:01:07 -04:00
Chiss
8214e3b8f4 Lots of little bug fixes 2014-04-05 16:52:23 +11:00
Jonathan Williams
05d916de3c Fixed custombuild selection not applying armor 2014-04-04 15:57:56 -04:00
Chiss
13b8f1e7ea Champs Update 2014-04-04 13:26:00 +11:00
Chiss
26fe974b00 More CHamps 2014-04-03 15:48:58 +11:00
Chiss
80c153095b Cooldown bar 2014-04-02 22:03:56 +11:00
Chiss
2f0167ea09 Champs Update 2014-04-02 21:22:21 +11:00
Chiss
2aaf749414 Champions Update 2014-04-02 15:19:58 +11:00
Jonathan Williams
d227a6bd06 Changed full server message 2014-03-29 18:45:44 -04:00
Chiss
fce249d7d8 fixed some desc stuff 
castle seige removed OP kit
 2014-03-28 18:50:38 +11:00
Chiss
4386ce0b96 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 
Conflicts:
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
 2014-03-28 14:55:13 +11:00
Jonathan Williams
aae40d3899 Changed up Skills and SkillsPage for Dom 2 changeover. 
Fixed CustomBuild stuff.
 2014-03-27 22:17:31 -04:00
Chiss
e4a86e0600 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-22 10:45:01 +11:00
Chiss
fe09c3fc49 More CS Update 2014-03-22 10:44:31 +11:00
Jonathan Williams
8bf78fe14d Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex 2014-03-21 15:30:06 -07:00
Jonathan Williams
33d342b049 updated 1.7 stuff. 2014-03-21 10:57:31 -07:00
Chiss
ab2a72ba16 CS Update 2014-03-21 11:59:56 +11:00
Jonathan Williams
f24f81b7c3 Finished conversion. 2014-03-19 04:09:40 -07:00
Jonathan Williams
7042159f46 Updated to 1.7 and changed namespaces to 1.7 2014-03-19 02:24:26 -07:00
Chiss
a7888b0c02 Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex 2014-03-19 17:51:48 +11:00
Chiss
7714ff4a09 CS Update 2014-03-19 17:51:37 +11:00
Jonathan Williams
9715f5454a Removed double gems. 
Removed unused code for ssm time
 2014-03-18 12:55:04 -07:00
Chiss
6830033d8a PLEASE JUST WORK :( 2014-03-16 10:52:34 +11:00
Chiss
d6e3f076cd PLEASE JUST WORK MR TORTOISE 2014-03-16 10:42:30 +11:00