Aaron Brock
|
750dddeabc
|
Editing .classpath and a main testing method in UtilBlock
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-19 21:10:10 -04:00 |
|
Aaron Brock
|
61494f93ba
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
|
2015-06-19 18:13:48 -04:00 |
|
Cheese
|
13ae7a19db
|
jr.dev rank up
|
2015-06-19 18:06:40 +10:00 |
|
Cheese
|
cf152c4897
|
fixed notifs being sent to people who didnt need them
|
2015-06-19 13:46:56 +10:00 |
|
Cheese
|
de83e58e75
|
removed debug
|
2015-06-19 13:29:32 +10:00 |
|
Cheese
|
8a224950b3
|
Added sale notifications
Added 3s chat delay
|
2015-06-19 13:27:59 +10:00 |
|
Aaron Brock
|
76e4dc6056
|
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-18 19:50:06 -04:00 |
|
Jeremiah Bishop
|
dd9e6a6866
|
Started adding SkyWars game mechanics
|
2015-06-18 14:54:26 -04:00 |
|
Shaun Bennett
|
71da87a5ae
|
Some cleanup
|
2015-06-17 21:36:47 -05:00 |
|
Cheese
|
9a3a014dd5
|
removed debug!
|
2015-06-18 12:04:49 +10:00 |
|
Shaun Bennett
|
b5f4574b1b
|
Show region on scoreboard, moving on to event finishes
|
2015-06-17 20:37:45 -05:00 |
|
Aaron Brock
|
b0ca5ca4aa
|
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-17 20:54:28 -04:00 |
|
Aaron Brock
|
41e77b1ade
|
Fixed double-half-slabs (line 68)
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-06-17 20:49:35 -04:00 |
|
Shaun Bennett
|
dbdb2b3fc5
|
Scoreboards and WorldEvent work
|
2015-06-17 17:40:16 -05:00 |
|
Cheese
|
6886484d79
|
Fixed Micro Battles lag (stupid lava)
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
|
2015-06-17 13:02:12 +10:00 |
|
Cheese
|
47744a80e9
|
jnr dev
|
2015-06-17 10:44:29 +10:00 |
|
Cheese
|
3014521e79
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-17 10:43:01 +10:00 |
|
Cheese
|
c8843aa2b2
|
jnr dev rank
|
2015-06-17 10:42:20 +10:00 |
|
Jonathan Williams
|
0d12a2c12d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-16 12:43:04 -05:00 |
|
Jonathan Williams
|
678dff48fe
|
Updated ignore list.
|
2015-06-16 12:42:55 -05:00 |
|
libraryaddict
|
b0c026e67c
|
Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn
|
2015-06-16 14:01:52 +12:00 |
|
Jonathan Williams
|
88328148d1
|
Modified hardcoded IPs for Bungee player counts.
Added Jr Dev rank.
|
2015-06-15 12:52:59 -05:00 |
|
Shaun Bennett
|
8245b6c466
|
Schematic generation over time, fixes to gold manager drops
|
2015-06-14 17:30:02 -05:00 |
|
Jonathan Williams
|
47099a0b20
|
Changed default redis ip to new us redis.
Changed previous server to gold text when sending to new server.
|
2015-06-12 15:45:54 -05:00 |
|
Shaun Bennett
|
d24f01ba86
|
More event stuff!
|
2015-06-11 23:35:29 -05:00 |
|
Cheese
|
a141cec104
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-11 08:57:04 +10:00 |
|
Cheese
|
390ffcab6d
|
bridges support for lillypads map
|
2015-06-11 08:56:32 +10:00 |
|
Shaun Bennett
|
9cdf69b19d
|
More work on events
|
2015-06-09 22:58:52 -05:00 |
|
Ty Sayers
|
4dd1cf43de
|
Add ability to convert Gems into Gold daily to Bank Shop, including redis-based system for tracking most recent transfers. Fix bug with item attributes that reference potions not properly displaying potion value effects (uses roman numerals). Prepare for custom textured Legendary items by modifying over to record-based materials. Add base for organic produce / farming shop.
|
2015-06-09 15:46:38 -04:00 |
|
Jonathan Williams
|
f0ce43ca5a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-09 13:22:45 -05:00 |
|
Shaun Bennett
|
a20f41be09
|
Merge remote-tracking branch 'origin/master'
|
2015-06-09 13:21:26 -05:00 |
|
Shaun Bennett
|
3f9010fb7a
|
Fix GameScore comparator
|
2015-06-09 13:21:15 -05:00 |
|
libraryaddict
|
37c6593753
|
Hub: Fix rulebook
|
2015-06-10 05:27:19 +12:00 |
|
libraryaddict
|
2971761a5e
|
Game stop command: Move unregister of game listener after the gamestate has been changed
|
2015-06-09 22:19:03 +12:00 |
|
Jonathan Williams
|
c6352445cf
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-08 23:18:06 -05:00 |
|
Shaun Bennett
|
d1a7d16810
|
Fixes GoldManager
|
2015-06-08 15:04:30 -05:00 |
|
Shaun Bennett
|
6a0584d419
|
Merge remote-tracking branch 'remotes/origin/clans_custom_gear' into clans/world-events
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/economy/GoldManager.java
|
2015-06-08 15:03:51 -05:00 |
|
Shaun Bennett
|
aa9aba92cd
|
Commit for merge
|
2015-06-08 14:59:06 -05:00 |
|
libraryaddict
|
1f08c989b5
|
Minestrike: Enforce resource pack
|
2015-06-09 03:31:24 +12: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
|
24a1016836
|
Slime enrage
|
2015-06-06 15:39:51 -05:00 |
|
Shaun Bennett
|
6ea000fd22
|
Remove slimes when server stops
|
2015-06-06 15:16:03 -05:00 |
|
Shaun Bennett
|
b2bdfe384b
|
Fix IllegalArgumentException with UtilPlayer method
|
2015-06-06 15:02:16 -05:00 |
|
Shaun Bennett
|
1f92564ea1
|
Changes to Slime Boss, ability to drop gold with GoldManager, small KOTH changes. [ALL UNTESTED]
|
2015-06-06 14:49:41 -05:00 |
|
libraryaddict
|
8cf10afb1b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-06-06 18:31:08 +12:00 |
|
libraryaddict
|
fd3232f45d
|
Mineware: Rename old MineWare and move packages
|
2015-06-06 18:30:47 +12:00 |
|
libraryaddict
|
ef9c69f356
|
UtilShapes: Fix a method, add a space in OldMineWare in GameType
|
2015-06-06 18:08:37 +12:00 |
|
libraryaddict
|
5f2810ae37
|
SurvivalGames: Fix anyone able to start game
|
2015-06-06 18:07:55 +12:00 |
|
Ty Sayers
|
971612a538
|
Fix bug relating to Energy Shop purchases and item functionality. Fix bug with GoldManager not being properly initialized on plugin start-up. Add Shops safe-zone to region claims for default clans across world. Create BankShop for all interactions related to economy management, specifically buying & selling GoldTokens as well as converting Gems into Gold on a daily basis.
|
2015-06-05 19:18:06 -04:00 |
|