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

2946 Commits

Author SHA1 Message Date
Ben
7f92a3c048 incognito changes 2016-04-05 00:38:27 +01:00
Shaun Bennett
ff929a8515 Merge remote-tracking branch 'remotes/origin/develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
 2016-04-05 00:57:28 +10:00
Shaun Bennett
fecd3c1eaa Final changes 2016-04-04 23:28:38 +10:00
Cheese
9969b7d783 support for resource packs for different MC versions 2016-04-02 11:39:40 +11:00
Shaun Bennett
e8dcc4a3e2 Merge branch 'develop' into clans/beta 
# Conflicts:
#	Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java
#	Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
#	Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
 2016-03-23 11:02:20 +11:00
Shaun Bennett
a107c38f28 Comment out missing ring game kit so we can compile 2016-03-23 10:18:22 +11:00
Shaun Bennett
85cb065d5c Merge pull request #14 from Mineplex-LLC/Dual_1.9 
1.9 Bugfixes + Ring game
 2016-03-22 19:25:37 +11:00
Shaun Bennett
61b79fab9d Merge pull request #13 from Mineplex-LLC/PC-15 
Fix PC-13, PC-15, PC-16, PC-17
 2016-03-21 20:31:58 +11:00
Jonathan Williams
750b960b46 Fixed references to snake events. 2016-03-20 16:24:11 -05:00
Jonathan Williams
109190ee58 Moved snake events to their own classes. 
Memory cleanup for Snake.
 2016-03-20 15:54:04 -05:00
Jonathan Williams
262f659ffa Fix with TurfForts infinite while loop. 2016-03-20 15:46:57 -05:00
Jonathan Williams
3bc8dd0098 Fixed bug with infinite loop in Bridges MushroomSpawn. 2016-03-20 00:32:33 -05:00
Ben
723f62b8f9 incognito fixes and loads of other fixes 2016-03-20 01:06:46 +00:00
Ben
86c50cc3cd updates 2016-03-11 19:03:32 +00:00
git
557b0bf978 Fix Wither disguise 2016-03-11 01:55:49 +13:00
Virizion
67e844db29 Added /e bridge <seconds> PC-17 2016-03-08 21:21:53 -05:00
Ben
5b3da3d06f Consistency. (Changed Vanish to Incognito) 2016-03-09 01:53:01 +00:00
Virizion
6c0d18662f Added /e clear <player or @a> PC-16 2016-03-08 20:45:23 -05:00
Ben
befb27d3db Finalized Vanish system 2016-03-09 01:45:17 +00:00
Virizion
c89669aec9 Add /e announce <text> PC-15 2016-03-08 20:23:33 -05:00
git
496983ee04 Untested bugfixes 2016-03-07 22:29:14 +13:00
Shaun Bennett
d108679d43 Fix compile error 2016-03-04 14:09:20 -06:00
git
6d0ca4f813 Merge branch 'Dual_1.9' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
 2016-03-03 13:49:31 +13:00
git
0ffa67dfb8 Ring game 2016-03-03 13:48:22 +13:00
Shaun Bennett
3447354814 Dual 1.9 Fixes 2016-03-02 12:58:30 -06:00
Shaun Bennett
a3b7a3269c Merge branch 'develop' into Dual_1.9 2016-03-01 15:14:59 -06:00
Shaun Bennett
923e51483c Remove fill line 2016-02-26 04:29:27 -06:00
Shaun Bennett
4472c52432 Fix bucket 2016-02-26 04:21:26 -06:00
William Burns
268536ce68 push 4 shaun 2016-02-26 08:13:28 +00:00
William Burns
e4ba5d9723 Fix colour targeting FINALLY! 2016-02-25 19:48:15 +00:00
William Burns
dead7a0850 Use a different method for targeting blocks. 2016-02-25 16:09:00 +00:00
William Burns
a97409b64a Adjust max distance for targeting. 2016-02-25 15:04:19 +00:00
William Burns
7f6517a823 Ignore barrier blocks when drawing. 2016-02-25 14:23:16 +00:00
git
2a9d49ccd9 Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9 2016-02-25 18:11:12 +13:00
William Burns
19b6c3d95f Make sure the blocks are in the canvas. 2016-02-24 21:37:22 +00:00
William Burns
a5060e014b Replace old paint bucket recursive filling. 2016-02-24 21:34:41 +00:00
William Burns
35a853a198 Remove redo/undo system as per request of @mightysigils. 2016-02-24 08:17:13 +00:00
William Burns
33bf3e2e6e Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update 2016-02-24 08:03:42 +00:00
William Burns
700f5ec44a Add Redo/Undo system (WIP). 2016-02-24 07:58:50 +00:00
md_5
c811906a7e REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a) 2016-02-19 18:21:01 +11:00
Shaun Bennett
7714e4960c Use DBPool for everything 2016-02-19 00:17:38 -06:00
md_5
b58ea5b51a Provide option to load config from mineplex.yml, not per game folders. 2016-02-19 15:25:09 +11:00
libraryaddict
8b1b63c8b3 Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9 
Conflicts:
	Patches/craftbukkit.jar
 2016-02-18 16:45:37 +13:00
md_5
1a1c64dc51 Fix PerkMadScientist on non game zombies. 2016-02-17 18:44:49 +11:00
md_5
b5f4055269 Fix command stack trace on unitialized arcade games. 2016-02-17 18:40:24 +11:00
md_5
3fad9c639a Fix stack trace in master builders when clicking on a watch. 2016-02-17 18:39:26 +11:00
md_5
50f58ba3a5 Don't stack entities when a game isn't running. 2016-02-17 18:33:40 +11:00
md_5
628e77a701 Don't process empty chat messages. 2016-02-17 18:32:43 +11:00
md_5
e6c00b06ee Fix exception in GameChatManager if an Arcade game has not been initialized. 2016-02-17 18:29:47 +11:00
md_5
e3861d3bc0 Fix NPE in TnTGenerator 2016-02-17 18:22:37 +11:00