Chiss
|
2384b91b06
|
game timer > advertisement
|
2014-11-16 14:45:18 +11:00 |
|
Chiss
|
900c31f479
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-11-16 14:41:11 +11:00 |
|
Chiss
|
cd890e6c6c
|
disabled spec menu in minestrike - fixes shop bug.
|
2014-11-16 14:40:50 +11:00 |
Jonathan Williams
|
2e58342032
|
Removed MS from beta.
|
2014-11-15 19:27:37 -08:00 |
|
Jonathan Williams
|
24b59e5a9d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 16:26:39 -08:00 |
|
Chiss
|
4c3610c3ac
|
fixed DMT silence
|
2014-11-16 10:46:26 +11:00 |
|
Jonathan Williams
|
99ff386ac1
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 14:32:40 -08:00 |
|
Chiss
|
454deb03db
|
fixed SG crash bug
|
2014-11-16 09:31:03 +11:00 |
|
Jonathan Williams
|
ad6f41e1c6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 03:42:57 -08:00 |
|
Chiss
|
057594205e
|
Only closing CREATIVE Inv for non-ops.
|
2014-11-15 22:40:56 +11:00 |
|
Chiss
|
ca58f11174
|
specs should be able to view stats now
|
2014-11-15 22:32:00 +11:00 |
|
Jonathan Williams
|
81b5317376
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 03:31:01 -08:00 |
|
Chiss
|
fb70b76d29
|
FINGERS CROSSED
|
2014-11-15 22:29:53 +11:00 |
|
Jonathan Williams
|
857ff29461
|
Removed buggy player disguises.
Removed datavalues from wither disguise.
|
2014-11-15 03:21:48 -08:00 |
|
Jonathan Williams
|
531b242cce
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 03:08:35 -08:00 |
Shaun Bennett
|
d16896e493
|
Merge remote-tracking branch 'origin/master'
|
2014-11-15 05:04:57 -06:00 |
|
Shaun Bennett
|
1ca23390cc
|
Fix my derp
|
2014-11-15 05:04:48 -06:00 |
|
Jonathan Williams
|
48c522a86b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 03:03:52 -08:00 |
|
Chiss
|
8d6793060c
|
made early levels a little easier to progress through
|
2014-11-15 21:33:28 +11:00 |
|
Jonathan Williams
|
2af66c99e7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-15 01:17:21 -08:00 |
|
Chiss
|
41b6296788
|
Wither no longer shoots in pregame lobby
|
2014-11-15 20:16:18 +11:00 |
|
Jonathan Williams
|
df76f6be10
|
More work on Clans.
|
2014-11-15 01:13:14 -08:00 |
|
Jonathan Williams
|
685a2899ca
|
Added custom name to wither disguise.
|
2014-11-15 01:12:58 -08:00 |
|
Chiss
|
51bc53262d
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-11-15 19:32:08 +11:00 |
|
Chiss
|
ca4eec20ed
|
Wither Assault update
|
2014-11-15 19:31:56 +11:00 |
|
Shaun Bennett
|
521b1e5f3b
|
Merge remote-tracking branch 'origin/master'
|
2014-11-13 21:54:15 -06:00 |
|
Jonathan Williams
|
2cf76ae5b4
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-13 19:15:05 -08:00 |
|
Jonathan Williams
|
4812da2cd9
|
More work on Clans - Clan repository.
|
2014-11-13 19:14:56 -08:00 |
|
Jonathan Williams
|
1ee16d284d
|
Updated StaffServer packages to reflect enjin shop.
|
2014-11-13 19:14:43 -08:00 |
|
Chiss
|
8ab0116a27
|
initial push of Wither Assault
|
2014-11-14 14:14:31 +11:00 |
|
Jonathan Williams
|
62fbeeda20
|
Added Wither disguise.
|
2014-11-13 19:14:14 -08:00 |
|
Shaun Bennett
|
223bc2d0c0
|
Remove some debug messages that we no longer need
|
2014-11-13 19:34:55 -06:00 |
|
Shaun Bennett
|
6038c72e86
|
Add cleaner page for when there is only 1 team
|
2014-11-13 19:33:39 -06:00 |
|
Shaun Bennett
|
ea8b8dca15
|
Disable spectator menu for castle siege and uhc until I work out a better way to show that many players
|
2014-11-13 19:18:28 -06:00 |
|
Shaun Bennett
|
af31f4cd42
|
Add Tab handling for MultiCommandBase and "game set" command
|
2014-11-13 18:22:00 -06:00 |
|
Shaun Bennett
|
48c09aa311
|
Making spectator gui look better
|
2014-11-13 18:05:28 -06:00 |
|
Shaun Bennett
|
eb4b451e12
|
Fixing some spectator gui bugs
|
2014-11-13 16:41:42 -06:00 |
|
Shaun Bennett
|
8b73b89a17
|
Merging spectator gui with main branch
|
2014-11-13 16:03:14 -06:00 |
|
Chiss
|
112f76a29a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-11-13 18:10:10 +11:00 |
|
Chiss
|
9eaacd20ab
|
fixed slime healing
fixed sheep quest brute not dropping sheep
updated punish page
|
2014-11-13 18:09:54 +11:00 |
CoderTim
|
09ca2234c4
|
Fixed survival games death match bug: https://trello.com/c/jNGSUUGI
|
2014-11-13 01:49:14 -05:00 |
|
CoderTim
|
7667aa25a8
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2014-11-13 00:26:53 -05:00 |
|
Chiss
|
c5a873ffab
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2014-11-13 14:40:26 +11:00 |
|
Chiss
|
f9f7a834c2
|
geno morf
|
2014-11-13 14:38:33 +11:00 |
|
Jonathan Williams
|
7cad40044a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
Plugins/Mineplex.Core/src/mineplex/core/report/ReportPlugin.java
|
2014-11-12 19:36:00 -08:00 |
|
Jonathan Williams
|
1372f74921
|
Refactored some names in MiniPlugin
Work on clans.
|
2014-11-12 19:21:12 -08:00 |
|
Jonathan Williams
|
0193c397fb
|
Added Kit unlocks to staff server
Added password persistence in db.
|
2014-11-12 19:20:41 -08:00 |
|
CoderTim
|
d363637015
|
Achievement bug fixes
|
2014-11-12 20:56:57 -05:00 |
|
Jonathan Williams
|
2e848c2ac2
|
Fixed some of twiggy conflicts.
|
2014-11-12 05:13:58 -08:00 |
|
Jonathan Williams
|
8d62966abc
|
Created Clans project.
Converted Fields code complete (not tested).
|
2014-11-12 05:13:16 -08:00 |