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

73 Commits

Author SHA1 Message Date
Ty Sayers a9f5197c64 Merge branch 'clans/world-events' of http://184.154.0.242:7990/scm/min/mineplex into clans_custom_gear 
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java
	Plugins/Mineplex.Database/src/mineplex/database/Account.java
	Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
 2015-08-22 15:18:51 -04:00
libraryaddict a1ea03f74b Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into clans/world-events 
Conflicts:
	Plugins/.idea/misc.xml
	Plugins/.idea/modules.xml
	Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
	Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemPaintballGun.java
	Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
	Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
	Plugins/Mineplex.Database/src/mineplex/database/Routines.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
	Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
 2015-08-14 19:44:56 +12:00
Shaun Bennett 3eb7e91fbb Removing the magical 3 2015-08-11 04:38:37 -05:00
Shaun Bennett b8b19ed4a5 Merge remote-tracking branch 'remotes/origin/master' into Bonus 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
#	Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
 2015-08-10 03:24:59 -05:00
Shaun Bennett c67f4fa7e6 Votifier fixes 2015-08-06 06:45:47 -05:00
Shaun Bennett 4cad99eb76 Lots of bonus work, start adding Votifier plugin 2015-08-06 00:45:39 -05:00
William Burns 0c5cc25634 Stuff 2015-08-03 12:48:17 +01:00
William Burns bf292ecd39 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Plugins/.idea/encodings.xml
#	Plugins/.idea/modules.xml
 2015-08-03 11:51:46 +01:00
Shaun Bennett bd9d222cff Fix IntellIJ Files 2015-08-03 05:50:02 -05:00
William Burns a964f343c7 xml files are ew 2015-08-01 14:55:01 +01:00
William Burns 5deb699b02 Added rejected games and whitelist to MPS. 2015-07-23 18:24:41 +01:00
Shaun Bennett 6a598690b0 Jooq Update, Async Clans calls, Clan name in scoreboard, block toss fix 2015-07-15 21:43:35 -05:00
Shaun Bennett 05b1e03598 Remove BungeeSigns Module? 2015-07-14 21:57:30 -05:00
William Burns d36dd26f42 Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames. 2015-07-14 11:56:13 +01:00
Shaun Bennett ae71de30db Fixes and changes 2015-07-14 01:57:53 -05:00
Shaun Bennett 5c5e7dd4a9 Merge master into clans 2015-07-13 20:42:10 -05:00
William Burns 3ba7ba259c Added map selection to MPS. 2015-07-08 15:24:16 +01:00
Ben Sihota ffbee4a9aa Add more details to /game 
Fix NPE with /game set
 2015-07-07 18:20:27 -07:00
Shaun Bennett abaa0ddee8 Level for Bobby 2015-07-05 13:30:16 -05:00
Jeremiah Bishop dd9e6a6866 Started adding SkyWars game mechanics 2015-06-18 14:54:26 -04:00
Shaun Bennett dbdb2b3fc5 Scoreboards and WorldEvent work 2015-06-17 17:40:16 -05:00
Shaun Bennett 3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
Shaun Bennett 8c7faf27dd Store gold drop amounts in item metadata (might be worth switching to our own storage?) 2015-06-06 16:04:11 -05:00
Shaun Bennett ed1c275347 Add Nautilus.Game.PvP to IntelliJ 2015-06-06 15:48:29 -05:00
Shaun Bennett 90a7362440 Marge with twiggys code, work on slime splitting 2015-06-04 00:21:09 -05:00
Shaun Bennett d8acb0aae6 Merge remote-tracking branch 'origin/clans_custom_gear' into clans/world-events 
Conflicts:
	Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
 2015-06-02 20:45:53 -05:00
Shaun Bennett 68b708e32e Schematic Utilities for Clans 2015-05-29 18:23:46 -05:00
Shaun Bennett 0499e1acf1 Merge remote-tracking branch 'origin/master' 2015-05-26 18:55:42 -05:00
Shaun Bennett ff377a3e5c [Clans] World event state system 2015-05-21 15:33:02 -05:00
Shaun Bennett 37f1f7eabb Master Builders changes for chiss 2015-05-01 17:46:42 -05:00
Shaun Bennett 4ac4e9d729 Start of world event framework 2015-04-30 13:15:20 -05:00
Shaun Bennett 5c6c4a23d5 Rename SDK to 1.8 instead of 1.7 (IDEA) 2015-04-21 20:10:01 -04:00
Shaun Bennett 50c38dc467 April Fools Additions, Fix some errors in Clans code, Add PlayerCache to IntellIJ IDEA 2015-03-31 17:22:50 -04:00
Shaun Bennett 145bf98590 Add JIRA configuration for IntellIJ IDEA 2015-02-24 21:18:08 -05:00
CoderTim 44f453c56e Updated jOOQ and database tables 2015-02-18 18:51:36 -05:00
Shaun Bennett 58eaaaa2ee Treasure fixes 2015-02-10 21:15:44 -05:00
Shaun Bennett 7de1c05d1c Clans run configuration, build configurations, and minor fixes on hub and arcade build configs. (IntelliJ IDEA) 2015-01-03 15:35:47 -05:00
Shaun Bennett befc2cff7c messing with jedis subpub 2014-12-22 22:49:28 -06:00
Shaun Bennett 1260e875fd Add clans to intellij. Update button 2014-12-17 18:38:35 -06:00
Shaun Bennett 30a7eea628 Motd stuff for xmas update 2014-12-12 00:28:29 -06:00
Shaun Bennett 93dc3c9090 pushing this for my laptop. not final code! 2014-12-11 09:17:19 -06:00
Shaun Bennett 0bb2d1db5b Some changes *_* 2014-12-04 17:29:47 -06:00
CoderTim cc8912b27e Added NPC info messages to NpcManager 2014-10-30 18:20:21 -04:00
CoderTim 25b10f0925 Added /npc refresh command to NpcManager 2014-10-15 01:04:52 -04:00
CoderTim f6f484c134 Refactored /npc commands 2014-10-02 22:08:00 -04:00
CoderTim ba2f0e37ef Log changes in players' coins to database 2014-09-25 17:03:26 -04:00
CoderTim 00c8bfbd61 Changed BungeeSign dependency to bukkit.jar to match dependencies in eclipse 2014-09-22 03:46:05 -04:00
Shaun Bennett 88a8e3a896 Hackyish way to log rewards given out in a database 2014-09-18 14:35:59 -05:00
CoderTim 1b416d3e6f Added database tables to record basic game stats 2014-09-15 16:36:59 -04:00
Shaun Bennett b910c5098c Cross version Holograms (Alignment might be a tad off) 
A bunch of stuff for Treasure Chests
 2014-09-10 12:16:31 -05:00