Ben
|
995d454f87
|
tutorial additions.
|
2016-03-18 02:47:51 +00:00 |
|
Ben
|
a4cbe54c78
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-18 01:21:25 +00:00 |
|
Ben
|
2cf59ced8b
|
new pvp timer management, fixed build house task, fixed incognito
|
2016-03-18 01:18:35 +00:00 |
|
Ben
|
add651780b
|
priority chat filters, fixed siege weapon clicking listeners being incorrect
|
2016-03-17 01:06:07 +00:00 |
|
Ben
|
93767b7a90
|
tutorial changes, chat filter system, commented out all web stuff for analytics.
|
2016-03-16 22:46:18 +00:00 |
|
Ben
|
0d237370e1
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-15 23:33:09 +00:00 |
|
Shaun Bennett
|
e53b8616d1
|
A ton of tutorial work
|
2016-03-15 10:29:43 -05:00 |
|
Ben
|
813a3833ae
|
implement temporary holograms
|
2016-03-15 00:48:50 +00:00 |
|
Ben
|
e08ba29ac1
|
Final fixing of cannon saving/loading
|
2016-03-14 22:48:31 +00:00 |
|
Ben
|
422df69335
|
incognito async stuff and updated alpha holograms
|
2016-03-11 21:50:48 +00:00 |
|
Ben
|
86c50cc3cd
|
updates
|
2016-03-11 19:03:32 +00:00 |
|
Shaun Bennett
|
1228ca227e
|
Add support for 1.9 resource packs, Text Tutorials
|
2016-03-11 11:50:08 -06:00 |
|
Ben
|
a27fb90c2a
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 02:21:03 +00:00 |
|
Ben
|
0e276474c5
|
fixerroooniissssss
|
2016-03-11 02:20:18 +00:00 |
|
Ben
|
01ba099d74
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:38 +00:00 |
|
Ben
|
c9eb2c9559
|
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-11 01:52:31 +00:00 |
|
Ben
|
57c65cf5ff
|
some changes and vanish fixes maybe?
|
2016-03-11 01:47:14 +00:00 |
|
Ben
|
bcfe4a42c0
|
changerooonis
|
2016-03-11 00:41:28 +00:00 |
|
Ben
|
33d978c6d6
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-10 22:12:41 +00:00 |
|
Ben
|
20ade492a8
|
tnt generator changes
|
2016-03-10 22:09:45 +00:00 |
|
Shaun Bennett
|
76782fd420
|
Fix issues
|
2016-03-10 15:07:22 -06:00 |
|
Ben
|
5b3da3d06f
|
Consistency. (Changed Vanish to Incognito)
|
2016-03-09 01:53:01 +00:00 |
|
Ben
|
befb27d3db
|
Finalized Vanish system
|
2016-03-09 01:45:17 +00:00 |
|
Ben
|
abdf61de0a
|
*more fixes*
|
2016-03-08 21:02:25 +00:00 |
|
Ben
|
af8f0fff16
|
vanish error fixes
|
2016-03-08 21:00:19 +00:00 |
|
Ben
|
69091c079f
|
Merge branch 'feature/incognito' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-03-08 20:58:11 +00:00 |
|
Shaun Bennett
|
9b65926d42
|
Fix rank monthly rewards description
|
2016-03-08 13:26:26 -06:00 |
|
Ben
|
1f09616784
|
chat packet listener
|
2016-03-08 18:28:54 +00:00 |
|
Shaun Bennett
|
99c2fefed2
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:27:45 -06:00 |
|
Ben
|
86ef10456c
|
packet hnadler beginning, switching to clans to fix errors
|
2016-03-08 18:10:57 +00:00 |
|
Ben
|
f24e196efd
|
Merge branch 'clans/beta' of https://github.com/Mineplex-LLC/Minecraft-PC into feature/incognito
|
2016-03-08 18:07:57 +00:00 |
|
Ben
|
036565abb7
|
more
|
2016-03-08 17:44:15 +00:00 |
|
Ben
|
0ff434cf91
|
progress
|
2016-03-08 16:49:32 +00:00 |
|
NewGarbo
|
ae2da31544
|
Merge branch 'clans/alpha' of https://github.com/Mineplex-LLC/Minecraft-PC into clans/beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-05 23:14:32 +00:00 |
|
NewGarbo
|
d92f817efc
|
fixed some teleportation bugs and a bit of cleanup
|
2016-03-05 22:50:06 +00:00 |
|
NewGarbo
|
73d8870daf
|
nether work (forgot to commit days ago oops)
|
2016-03-02 19:42:53 +00:00 |
|
Shaun Bennett
|
3447354814
|
Dual 1.9 Fixes
|
2016-03-02 12:58:30 -06: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 |
|
NewGarbo
|
2956b18821
|
some hologram work
|
2016-02-23 18:45:04 +00:00 |
|
Shaun Bennett
|
82d51a896f
|
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
|
2016-02-19 19:54:06 -06:00 |
|
Shaun Bennett
|
7714e4960c
|
Use DBPool for everything
|
2016-02-19 00:17:38 -06:00 |
|
Shaun Bennett
|
eab992e621
|
Delete SimpleStats
|
2016-02-18 23:01:23 -06:00 |
|
md_5
|
6d81e43b30
|
Don't print db config to System.out
|
2016-02-19 15:30:30 +11:00 |
|
NewGarbo
|
8507bb1bd8
|
all progress over this week
|
2016-02-18 21:29:42 +00: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
|
8893db60d7
|
Fix highly annoying exception in Reindeer mount.
|
2016-02-16 12:46:39 +11:00 |
|
Shaun Bennett
|
95c22a59fd
|
Use DNS for chat filter
|
2016-02-15 16:30:57 -06:00 |
|
Shaun Bennett
|
15ed2570e2
|
Valentines final changes, Change Gift Giver achievement
|
2016-02-15 20:43:46 -06:00 |
|
NewGarbo
|
e25accfba4
|
outpost saving and loadi9ng
|
2016-02-15 11:24:29 +00:00 |
|
NewGarbo
|
e6eb43ada8
|
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
|
2016-02-12 19:58:40 +00:00 |
|