Sarah
|
83da6b7a9a
|
Improving the /disguise command even more. ;D
|
2015-08-05 13:32:05 +02:00 |
|
Sarah
|
91de6a1852
|
last fix...
|
2015-08-05 08:40:09 +02:00 |
|
Sarah
|
511c61611a
|
fixing earlier commit.
|
2015-08-05 08:32:52 +02:00 |
|
Sarah
|
e55557e1fd
|
Improving the /disguise command.
|
2015-08-05 07:57:52 +02:00 |
|
Mini-Chiss
|
88fe5b3ec6
|
Merge branch 'MPS-Maps'
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
|
2015-08-04 17:37:32 +02:00 |
|
Mini-Chiss
|
1fd5c51f03
|
DINGO ATE MY BABY
|
2015-08-04 17:33:23 +02:00 |
|
Sarah
|
ec3bc7cc38
|
Try fixing the map selection.
|
2015-08-04 17:04:49 +02:00 |
|
William Burns
|
644d6c9914
|
Whitelist fixes. Implemented MapSource.
|
2015-08-04 11:21:58 +01:00 |
|
Mini-Chiss
|
13d139d197
|
team kills/deaths only store for 3 games now
|
2015-08-04 08:46:00 +02:00 |
|
Mini-Chiss
|
2d07cc571c
|
reduced invis in OITQ
|
2015-08-03 18:53:00 +02:00 |
|
Mini-Chiss
|
2f571aed25
|
fixed bugs from my vel fixes, WHOOPS. normalisation :(
|
2015-08-03 18:19:31 +02:00 |
|
Mini-Chiss
|
40e2b6216e
|
oops, was right before, reverting change.
|
2015-08-03 16:30:38 +02:00 |
|
Mini-Chiss
|
f350e4efe5
|
further fixed gem stuff!
|
2015-08-03 16:25:31 +02:00 |
|
Mini-Chiss
|
67fd0e2c1d
|
fixed MPS awards formatting
|
2015-08-03 16:24:43 +02:00 |
|
Mini-Chiss
|
ab670a03fb
|
fixed logic error that was displaying gems wrong
|
2015-08-03 16:23:50 +02:00 |
|
Mini-Chiss
|
e10d26dae1
|
reduced respawn time in OITQ
removed respawn msg for short respawn times
|
2015-08-03 16:18:59 +02:00 |
|
William Burns
|
817b8b03f6
|
Whitelist fixes etc.
|
2015-08-03 13:40:13 +01:00 |
|
William Burns
|
0c5cc25634
|
Stuff
|
2015-08-03 12:48:17 +01:00 |
|
William Burns
|
4ad19e4579
|
Merge branches 'MPS-Maps' and 'master' of ssh://184.154.0.242:7999/min/mineplex into MPS-Maps
|
2015-08-03 10:52:00 +01:00 |
|
Mini-Chiss
|
bb2e15c4fd
|
made it so games can set another game as its 'kit source' so games can share kit unlocks
|
2015-08-03 11:38:16 +02:00 |
|
Mini-Chiss
|
1d0bfbdf2d
|
fixed team sheep displaying in UHC lobby
|
2015-08-03 10:56:23 +02:00 |
|
Mini-Chiss
|
b26e01649b
|
removed requirement for ach kit
|
2015-08-03 10:13:46 +02:00 |
|
Mini-Chiss
|
eac8a3cd1c
|
fixed OITQ kit being unobtainable
|
2015-08-03 10:12:37 +02:00 |
|
Mini-Chiss
|
472409dc4b
|
fixed broadcast formatting
|
2015-08-03 10:06:15 +02:00 |
|
Mini-Chiss
|
2e1bccb3ad
|
DUN ALLOW overful
|
2015-08-03 09:02:28 +02:00 |
|
Mini-Chiss
|
0a84bd69d8
|
fixed some OITQ stuff
|
2015-08-02 23:17:23 +02:00 |
|
Mini-Chiss
|
4cc810f1c0
|
Merge branch 'Myst_KITS'
|
2015-08-02 17:55:53 +02:00 |
|
Mini-Chiss
|
afc41c8831
|
converted Player velocities to use UtilAction velocity methods, instead of Player.setVelocity
|
2015-08-02 11:50:26 +02:00 |
|
Mini-Chiss
|
ac4755a5a9
|
Fixed incorrect velocity
|
2015-08-02 11:24:34 +02:00 |
|
Mini-Chiss
|
ae8d351145
|
Merge branch 'SSM2PlayerTeams'
|
2015-07-31 14:09:55 +02:00 |
|
Sarah
|
fba10e4cbd
|
fixing the long term "Kit" bug ;D
|
2015-07-31 14:08:08 +02:00 |
|
Sarah
|
b2c538b189
|
little tag fix.
|
2015-07-31 13:40:39 +02:00 |
|
Sarah
|
60a1768821
|
Fixing Team display bug on disbanding.
|
2015-07-31 13:05:28 +02:00 |
|
Mini-Chiss
|
b2a567673c
|
disabled sale msg
added double gem weekend
|
2015-07-31 09:53:52 +02:00 |
|
Mini-Chiss
|
a3d768af6b
|
added res pack for HH
|
2015-07-30 15:07:40 +02:00 |
|
Mini-Chiss
|
31fd19aab5
|
added res pack for CC
|
2015-07-30 15:07:05 +02:00 |
|
Mini-Chiss
|
8a5088e181
|
fixed SGT deathmatch not working
|
2015-07-30 14:47:59 +02:00 |
|
Mini-Chiss
|
45d117a95a
|
added armor hotbar to smash
fixed scoreboard in snowfight
|
2015-07-30 14:45:28 +02:00 |
|
Mini-Chiss
|
8ef93c0b33
|
Merge branch 'SSM2PlayerTeams'
|
2015-07-30 08:42:50 +02:00 |
|
Sarah
|
30fa3b3309
|
Merge branch 'master' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
|
2015-07-30 03:07:41 +02:00 |
|
Sarah
|
37e432f0b2
|
Git fix.
|
2015-07-30 03:07:21 +02:00 |
|
Sarah
|
bf75594853
|
Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams
|
2015-07-30 02:33:51 +02:00 |
|
Sarah
|
de4d0a7dc3
|
Fixing needler, projectiles in SW and "Banannas...".
|
2015-07-30 02:33:06 +02:00 |
|
Mini-Chiss
|
97a144150b
|
fixed an NPE that was causing games not to end in MS
|
2015-07-29 21:51:18 +02:00 |
|
Mini-Chiss
|
be910cced9
|
gamemode color change
|
2015-07-29 17:00:36 +02:00 |
|
Mini-Chiss
|
0e55ce1879
|
removed old hint
|
2015-07-29 16:54:30 +02:00 |
|
Mini-Chiss
|
1004203b34
|
fixed up some merge issues
|
2015-07-29 16:48:49 +02:00 |
|
William Burns
|
13af2cec74
|
Pick highest voting button
|
2015-07-29 15:44:29 +01:00 |
|
Mini-Chiss
|
52844d7b80
|
Merge branch 'EventGameUpdates'
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
|
2015-07-29 16:41:35 +02:00 |
|
Mini-Chiss
|
71bedbe0fc
|
Merge branch 'WitherAssaultUpdate'
|
2015-07-29 16:37:29 +02:00 |
|