Shaun Bennett
|
11e49b9678
|
Some updates
|
2015-08-02 04:28:57 -05:00 |
|
Mini-Chiss
|
ac4755a5a9
|
Fixed incorrect velocity
|
2015-08-02 11:24:34 +02:00 |
|
Mysticate
|
9c14e3d35a
|
Worked on evolution
|
2015-08-01 17:24:12 -06:00 |
|
fooify
|
519449e015
|
lots of stuff (:
|
2015-08-01 11:42:32 -07:00 |
|
Mini-Chiss
|
7910170327
|
fixed achievemnt amount
|
2015-08-01 18:39:18 +02:00 |
|
William Burns
|
f361ae94dc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
# Conflicts:
# Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
# Plugins/.idea/compiler.xml
# Plugins/.idea/encodings.xml
# Plugins/.idea/misc.xml
# Plugins/.idea/modules.xml
|
2015-08-01 16:09:15 +01:00 |
|
William Burns
|
a964f343c7
|
xml files are ew
|
2015-08-01 14:55:01 +01:00 |
|
Mysticate
|
62072077c1
|
Fixed evolution rotation
|
2015-08-01 00:47:44 -06:00 |
|
Jonathan Williams
|
992c0fc36f
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-08-01 01:12:24 -05:00 |
|
Jonathan Williams
|
d3c5d0cbe6
|
Only store account cache stuff for 6 hours.
Update MOtd.
|
2015-08-01 01:12:01 -05:00 |
|
Shaun Bennett
|
fd65f27f0f
|
Fix some typos/formatting issues
|
2015-07-31 10:01:19 -05:00 |
|
fooify
|
e4141a1b72
|
Merge remote-tracking branch 'origin/master' into snow-sprint
|
2015-07-31 07:32:17 -07: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 |
|
Mysticate
|
53a3a29cd2
|
Extreme revisions. Cheers!
|
2015-07-31 00:50:32 -06:00 |
|
fooify
|
e59f2751f3
|
more stuff changed to snow sprint
|
2015-07-30 17:31:26 -07:00 |
|
fooify
|
014cac31f0
|
more changes to snow sprint
|
2015-07-30 14:04:39 -07:00 |
|
fooify
|
6c39c08abf
|
some progress on snow sprint
|
2015-07-30 11:59:04 -07: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
|
8d7c42134b
|
fixed mounts having nametags
|
2015-07-30 14:54:23 +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
|
0cf333ec00
|
lowered win req
|
2015-07-30 14:12:17 +02:00 |
|
Mysticate
|
f02924987e
|
Did things
|
2015-07-30 04:30:19 -06: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 |
|
Mysticate
|
a5d73d791a
|
Thing
|
2015-07-29 16:14:38 -06:00 |
|
fooify
|
b623f025ff
|
manually updating something
|
2015-07-29 14:31:11 -07:00 |
|
fooify
|
7c4786e7d2
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-07-29 14:15:24 -07:00 |
|
fooify
|
5da23fa322
|
Merge branch 'foo' of http://Fooify@184.154.0.242:7990/scm/min/mineplex.git into foo
|
2015-07-29 14:13:07 -07:00 |
|
fooify
|
db5c5a9888
|
*crosses fingers* please work!
|
2015-07-29 14:12:52 -07:00 |
|
Mini-Chiss
|
97a144150b
|
fixed an NPE that was causing games not to end in MS
|
2015-07-29 21:51:18 +02:00 |
|
fooify
|
389bf7a74c
|
please work...
|
2015-07-29 10:55:03 -07:00 |
|
Mysticate
|
ab49407584
|
Things
|
2015-07-29 11:52:44 -06:00 |
|
Aaron Brock
|
7065ea7319
|
Freezes the time using doDayLightCycle instead of using a UpdateEvent.
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-29 10:49:20 -07:00 |
|
Aaron Brock
|
d583598477
|
Fixed double-half-slabs (line 68)
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
|
2015-07-29 10:49:20 -07: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 |
|
Mini-Chiss
|
c32e959f61
|
Merge branch 'SnowFightUpdate'
|
2015-07-29 16:36:33 +02:00 |
|