Commit Graph

64 Commits

Author SHA1 Message Date
Shaun Bennett
3893617d58 Logitech Giveaway (still needs testing) 2015-11-06 21:15:37 -05:00
Shaun Bennett
aa9fd1abf3 Titan giveaway work 2015-10-09 22:14:10 -04:00
Shaun Bennett
8911617a0c Remove BungeeSigns again? 2015-10-01 14:01:36 -04:00
Shaun Bennett
8a9cc9ff14 Food Dupe Fix 2015-09-28 20:42:14 -04:00
Shaun Bennett
cf618abd4e BotSpam Module 2015-09-22 01:38:45 -04: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
William Burns
d36dd26f42 Added ChestLoot for games. Setup chest filling via ChestLoot for SurvivalGames. 2015-07-14 11:56:13 +01: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
3f9010fb7a Fix GameScore comparator 2015-06-09 13:21:15 -05:00
Shaun Bennett
0499e1acf1 Merge remote-tracking branch 'origin/master' 2015-05-26 18:55:42 -05:00
Shaun Bennett
37f1f7eabb Master Builders changes for chiss 2015-05-01 17:46:42 -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
CoderTim
235cf8cae7 Fixed win stats on solo games 2014-09-09 02:18:20 -04:00
CoderTim
91a2266a04 Set up jOOQ, fixed some IntelliJ issues, and added leaderboard stat tracking 2014-09-05 04:00:51 -04:00
CoderTim
aae46bdeda Removed unused intellij module 2014-09-03 16:58:53 -04:00
Shaun Bennett
e7f79aa5bf Update IntelliJ files for latest changes 2014-09-03 11:42:50 -05:00
Shaun Bennett
2cb87b23e6 Stat Gui, Start of Treasure Gui (disabled) 2014-08-24 16:08:19 -05:00
CoderTim
f266f4e016 More achievements 2014-08-20 19:20:11 -04:00
Shaun Bennett
43fd604695 Queue up polls for players instead of constantly checking for next poll 2014-08-17 17:47:38 -05:00
Shaun Bennett
4ba7da9a54 Polls! Still needs tweaks
Hub artifact stuff for IntelliJ
2014-08-17 17:30:35 -05:00
Shaun Bennett
e5340238b6 IntelliJ Hub Configurations 2014-08-17 13:57:20 -05:00