Shaun Bennett
|
2657ef336a
|
Merge remote-tracking branch 'origin/master'
|
2015-06-26 02:33:00 -05:00 |
|
Shaun Bennett
|
60901cc17e
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
|
2015-06-26 02:32:51 -05:00 |
|
Cheese
|
c31d3609bb
|
soup no longer spawns in stacks
|
2015-06-26 17:32:46 +10:00 |
|
Shaun Bennett
|
7c698f65cf
|
Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads
|
2015-06-26 02:31:35 -05:00 |
|
Jonathan Williams
|
c78ef9d93d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 02:30:01 -05:00 |
|
Cheese
|
a5aa2bc0e9
|
text changes
|
2015-06-26 17:28:23 +10:00 |
|
Cheese
|
2498f7756c
|
skyawrs stats icon
|
2015-06-26 17:16:16 +10:00 |
|
Cheese
|
c514cacd5d
|
more skywars fixes
|
2015-06-26 17:05:29 +10:00 |
|
Cheese
|
015ba53bbe
|
skywars hub text
|
2015-06-26 16:39:25 +10:00 |
|
Cheese
|
027efe02fc
|
skywars!
|
2015-06-26 16:38:44 +10:00 |
|
Jonathan Williams
|
efa06d370b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 01:13:42 -05:00 |
|
Jonathan Williams
|
86e2514e37
|
Fixed callbacks for gem/coin rewards.
|
2015-06-26 01:13:28 -05:00 |
|
Cheese
|
257c088948
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-26 16:08:17 +10:00 |
|
Cheese
|
b744320ecc
|
pearl trail fix
|
2015-06-26 16:08:04 +10:00 |
|
Shaun Bennett
|
1865e41144
|
Undead Camp
|
2015-06-26 01:05:36 -05:00 |
|
Cheese
|
caa51d0e89
|
Merge branch 'SkyWars'
|
2015-06-26 16:04:46 +10:00 |
|
Cheese
|
16af8453e3
|
pearl fix
|
2015-06-26 16:04:07 +10:00 |
|
Cheese
|
338797f4a6
|
skywars update
|
2015-06-26 15:57:47 +10:00 |
|
Cheese
|
aef8a00017
|
update!
|
2015-06-26 15:25:43 +10:00 |
|
Cheese
|
8f3d0ad84b
|
fixed some bugs :O
|
2015-06-26 14:38:39 +10:00 |
|
Cheese
|
0874178973
|
skywars update!
|
2015-06-26 14:14:22 +10:00 |
|
Cheese
|
2d1d65b239
|
skywars fixes
|
2015-06-26 13:15:03 +10:00 |
|
fooify
|
7f7edddf42
|
Fix TNT bug in SG - tested, works fine! :)
|
2015-06-25 19:36:31 -07:00 |
|
Cheese
|
5710831777
|
fixed webs dropping webs
|
2015-06-26 12:34:26 +10:00 |
|
Cheese
|
7d4e36651f
|
less random chests
|
2015-06-26 12:26:57 +10:00 |
|
Cheese
|
fdbaa4e9c7
|
dont allow overfill
|
2015-06-26 12:18:25 +10:00 |
|
Cheese
|
f1da68a82a
|
fixed chickens not spawning
|
2015-06-26 12:14:35 +10:00 |
|
Cheese
|
00da27a3d6
|
added middle chests
added chicken spawns
added zombie/chicken loot
|
2015-06-26 12:06:40 +10:00 |
|
Cheese
|
beb78270e5
|
skywars loot changes
|
2015-06-26 11:54:35 +10:00 |
|
Cheese
|
bb569a26e2
|
skywars update
|
2015-06-26 11:22:33 +10:00 |
|
Cheese
|
b48820a753
|
ore gen fixed!
|
2015-06-26 10:50:38 +10:00 |
|
Cheese
|
d9a8d2b6ab
|
ore changes
|
2015-06-26 10:36:45 +10:00 |
|
Jeremiah Bishop
|
0342a5ac61
|
Fixed Achievements
Reordered Kits
Added new Kit
etc, etc, etc...
|
2015-06-25 19:03:25 -04:00 |
|
fooify
|
2679d19a81
|
Missed a spot.
|
2015-06-25 08:19:12 -07:00 |
|
fooify
|
ba9e4ba5d9
|
Fix staff server not hiding in friends list
|
2015-06-25 08:17:28 -07:00 |
|
Cheese
|
2179795677
|
Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
|
2015-06-25 20:48:34 +10:00 |
|
Cheese
|
2bf1faa70d
|
fixed a few skywars bugs
added ore generation (but theres some wierd bug, still working on it)
|
2015-06-25 20:24:31 +10:00 |
|
Jonathan Williams
|
526b0dadb6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-06-25 04:58:26 -05:00 |
|
Jonathan Williams
|
567bb5cd6c
|
Fixed up MotdManager so that old values don't overwrite in the db.
|
2015-06-25 04:58:16 -05:00 |
|
Jonathan Williams
|
5bdb90b459
|
Changed disguise perm to YOUTUBE
|
2015-06-25 04:57:56 -05:00 |
|
Shaun Bennett
|
7f530f6593
|
New border dimensions
|
2015-06-24 23:18:18 -05:00 |
|
Shaun Bennett
|
a0d97d5d99
|
Scoreboard changes, Fix region values, add 1.8 Border for map
|
2015-06-24 22:44:41 -05:00 |
|
Jeremiah Bishop
|
ed667fedee
|
Added more achievements
|
2015-06-24 22:59:28 -04:00 |
|
Cheese
|
b77279a160
|
fixed notif msg
|
2015-06-25 11:22:23 +10:00 |
|
Jeremiah Bishop
|
cd10a2ad79
|
Fixed both kits
Added game achievements.
|
2015-06-24 20:08:31 -04:00 |
|
fooify
|
a36af0acc4
|
Remove space :) I assume this isn't intended
|
2015-06-24 10:28:39 -07:00 |
|
fooify
|
ea3c04b8c1
|
Add fooify to list of AFKers
|
2015-06-24 10:24:08 -07:00 |
|
Shaun Bennett
|
2735c81205
|
Fix bug with leaving and joining clans: online player list wouldnt update
|
2015-06-23 23:00:07 -05:00 |
|
Shaun Bennett
|
fa612c9c86
|
Chat filter clan names, Fix scoreboard bug
|
2015-06-23 22:48:51 -05:00 |
|
Shaun Bennett
|
935aba9c16
|
Some world event tweaks, refactor clans and clanTerritory to use new clanServer table with serverId, updated jooq classes
|
2015-06-23 21:45:55 -05:00 |
|