Chiss
|
ac723c14bd
|
Push so i can pull :O
just some xmas stuff
|
2013-12-21 08:42:49 +11:00 |
|
Chiss
|
6b33306755
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-12-18 21:46:40 +11:00 |
|
Jonathan Williams
|
e55885c85d
|
itsy
|
2013-12-18 05:22:40 -05:00 |
|
Chiss
|
f4edcedce3
|
push so i can pull :\?
|
2013-12-18 21:17:28 +11:00 |
|
Jonathan Williams
|
0ba8349e03
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-12-18 04:48:24 -05:00 |
|
Jonathan Williams
|
64dab19003
|
Cleanup
Prep work on leash disable functionality.
|
2013-12-18 04:48:16 -05:00 |
|
Chiss
|
54f2cb3467
|
Christmas hub snowman target cancel
|
2013-12-18 19:58:39 +11:00 |
|
Jonathan Williams
|
ab8013091d
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
|
2013-12-17 11:10:11 -05:00 |
|
Jonathan Williams
|
938e72b06d
|
Remove tourney stats.
|
2013-12-17 11:09:36 -05:00 |
|
Chiss
|
de99a642d3
|
Hub tourney text removal
|
2013-12-17 11:06:04 +11:00 |
|
Chiss
|
4bef100c6a
|
Xmas Hub
|
2013-12-16 14:32:51 +11:00 |
|
Chiss
|
c582b210b5
|
Hub + Stats + Tournament
|
2013-12-14 16:51:08 +11:00 |
|
Chiss
|
3ca67d60c0
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-12-14 16:38:46 +11:00 |
|
Chiss
|
9af8676307
|
Hub/Stats
|
2013-12-14 16:38:16 +11:00 |
|
Jonathan Williams
|
ac049e0397
|
FINE JUST FINE>>>>>> STUPID CHICKENS
|
2013-12-13 21:36:57 -08:00 |
|
Jonathan Williams
|
69fa9eaba5
|
Added getters for stats/StatsManager.java
|
2013-12-13 21:35:04 -08:00 |
|
Jonathan Williams
|
e054b06cc2
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-12-13 21:01:08 -08:00 |
|
Jonathan Williams
|
6b92b6c4a8
|
Added stats manager.
Added lots of missing files.
|
2013-12-13 21:00:56 -08:00 |
|
Chiss
|
1eebed737e
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
|
2013-12-13 18:05:08 +11:00 |
|
Chiss
|
5f2e457362
|
Minor HG Stuffs ;o
|
2013-12-13 16:21:39 +11:00 |
|
Jonathan Williams
|
d6544202f0
|
Added ghost ability for mobs.
|
2013-12-12 02:19:58 -08:00 |
|
Chiss
|
97d8923678
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-12-07 23:04:59 +11:00 |
|
Chiss
|
2fb4bc4fbc
|
UHC stuff
|
2013-12-07 23:04:10 +11:00 |
|
Jonathan Williams
|
9382271315
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-12-06 01:57:18 -08:00 |
|
Jonathan Williams
|
03627eb0c3
|
Changed all mysql connections to be persistent.
|
2013-12-06 01:57:09 -08:00 |
|
Chiss
|
db7b4f3a40
|
more draw words
|
2013-12-04 15:25:18 +11:00 |
|
Chiss
|
00bccdc1f7
|
More draw words
UHC complete! probably not :'(
|
2013-12-04 13:31:23 +11:00 |
|
Chiss
|
a29cc4664f
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
|
2013-12-04 12:48:12 +11:00 |
|
Chiss
|
28c928b4c3
|
Xmas + UHC changes
|
2013-12-04 12:45:17 +11:00 |
|
Jonathan Williams
|
8984309c56
|
Cleaned up portal cancellation.
|
2013-12-03 17:41:58 -08:00 |
|
Jonathan Williams
|
022c343a98
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java
|
2013-12-03 13:58:28 -08:00 |
|
Jonathan Williams
|
09a77e98cc
|
Prevent Enderdragon from creating portal.
|
2013-12-03 13:57:43 -08:00 |
|
Chiss
|
36a98d5e41
|
UHC changes
|
2013-12-03 21:31:02 +11:00 |
|
Chiss
|
f972418fd1
|
UHC!
|
2013-12-03 17:13:29 +11:00 |
|
Chiss
|
d10871abd9
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-12-03 16:27:12 +11:00 |
|
Chiss
|
43196dd7af
|
UHC Update
|
2013-12-03 16:26:47 +11:00 |
|
Jonathan Williams
|
ce4eb43145
|
UHC end transfer.
|
2013-12-02 21:20:28 -08:00 |
|
Jonathan Williams
|
27c79e7c92
|
Turned lobby balancer back to US
Added Draw map
|
2013-11-30 16:38:02 -08:00 |
|
Chiss
|
f4e3b6efdc
|
hub news/skytext for draw game
|
2013-11-30 22:11:26 +11:00 |
|
Chiss
|
c8fc792fdd
|
UHC prep for s4
Draw updates
|
2013-11-30 20:40:09 +11:00 |
|
Chiss
|
fee559a892
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/mineplex
|
2013-11-29 23:55:11 +11:00 |
|
Chiss
|
8807854b57
|
Added Draw
|
2013-11-29 23:38:38 +11:00 |
|
Jonathan Williams
|
31517d679a
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-11-26 17:48:40 -08:00 |
|
Chiss
|
f927f2c1be
|
wolf tackle fix
HG furnace no use
|
2013-11-27 12:48:16 +11:00 |
|
Jonathan Williams
|
d09004e967
|
Added new maps.
|
2013-11-26 17:47:55 -08:00 |
|
Chiss
|
0d811272cc
|
final HG fix :D
|
2013-11-27 11:52:20 +11:00 |
|
Chiss
|
6f06ac2018
|
HG lag fixes
item frames cannot be broken
creep damage messages
|
2013-11-26 23:54:02 +11:00 |
|
Jonathan Williams
|
25782813f4
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2013-11-26 02:35:05 -08:00 |
|
Jonathan Williams
|
9a7a815a21
|
Added multiblock packets only for sg.
RE-tweaked loot.
Fixed blocks pawns in lobby.
|
2013-11-26 02:34:54 -08:00 |
|
Chiss
|
e57722ed0b
|
HG snowball fix
|
2013-11-26 12:02:03 +11:00 |
|