2bf734a15c
DONEONDONFA;SDJF;LADSF;OCAJEFOJ;FJAD;FAJSMLDFAH D
2015-12-17 23:08:07 -05:00
2c09fd969b
Attempt at fixing spectator page
2015-12-17 22:24:44 -05:00
806b656dcf
Merge remote-tracking branch 'remotes/origin/develop' into virizion_speed_builder
2015-12-17 21:56:01 -05:00
53f9a051c5
Fix spectator page sorting team list
2015-12-17 21:52:34 -05:00
7621fe793d
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-17 21:50:32 -05:00
5f506e3810
Moved team generation.
2015-12-17 21:49:15 -05:00
066d0a861f
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-17 21:00:15 -05:00
c2fb6e6c15
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-12-17 18:34:25 -05:00
2953fe395f
Changed dns api key to new key.
...
Prevent server monitor redis calls to cause restarts.
Added winter chests to customer support.
2015-12-17 18:33:49 -05:00
b1a3dfdad8
Merge pull request #100 in MIN/mineplex from feature/player-data to develop
...
* commit 'e7243d4b9c814266ebe3c03a08730b054fadc56b':
Re-add getArcadePlayer(Player player)
Changed to setData in PlayerCustomData
Changes to core client manager, and finishing custom data!
Testing ArcadePlayer implementation
Add MineplexPlayer -> ArcadePlayer
Add to Arcade and Hub
Added custom data
Custom data, waiting for JLO
2015-12-17 17:28:55 -06:00
e7243d4b9c
Re-add getArcadePlayer(Player player)
2015-12-17 22:19:45 +00:00
3e8c3cb928
Changed to setData in PlayerCustomData
2015-12-17 22:16:05 +00:00
2ac28c4fd5
Merge branches 'develop' and 'feature/player-data' of ssh://184.154.0.242:25565/min/mineplex into feature/player-data
...
# Conflicts:
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-12-17 21:44:31 +00:00
5c045bfce4
Changes to core client manager, and finishing custom data!
2015-12-17 21:27:44 +00:00
7f188072ad
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into develop
2015-12-18 10:03:41 +13:00
66372c397b
First version of ResourcePackManager that handles all resource packs globally
2015-12-18 10:03:03 +13:00
7d9b97180d
Testing ArcadePlayer implementation
2015-12-17 01:48:55 +00:00
d28c2be1c3
Epic chnage that saved the day omg
2015-12-16 20:26:04 -05:00
ee202bc7f5
Add MineplexPlayer -> ArcadePlayer
2015-12-16 22:32:34 +00:00
4077aa808f
Add to Arcade and Hub
2015-12-16 22:01:51 +00:00
370c59ce75
Added custom data
2015-12-16 21:52:41 +00:00
4e9e0243cd
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
# Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
# Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
2015-12-16 18:16:08 +01:00
baf0f254bb
Custom data, waiting for JLO
2015-12-16 14:41:57 +00:00
628ee8a137
Some small fixes.
2015-12-16 00:02:21 -05:00
7fa1963268
Merge remote-tracking branch 'remotes/origin/master' into virizion_speed_builder
2015-12-15 23:06:13 -05:00
d16dd4a9d2
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:35:55 -05:00
4566577c68
Die player cache
2015-12-15 19:26:09 -05:00
b36bf37197
Merge remote-tracking branch 'origin/master' into update-paintball
2015-12-15 19:22:38 -05:00
63635e7cf8
Merge pull request #99 in MIN/mineplex from develop to master
...
* commit '211e440e67d6e81cc67c974f8b6886306600de23':
Slight winter reward rarity changes
Fix shard values
More Fixes
Don't give Winter Holiday Chests to offline players
Update monthly bonuses
Fix mounts owned count
Fix Grinch Hat
Dont disable new gadgets in games
disable tutorial
test push (change version to 0.17d)
Spawn nametags far far away from players
loads of changes (pvp timer, unsafe stuff)
fixed unsafe timer
2015-12-15 14:00:17 -06:00
211e440e67
Merge remote-tracking branch 'remotes/origin/master' into develop
...
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
2015-12-15 15:00:14 -05:00
aef704d972
Slight winter reward rarity changes
2015-12-15 14:58:09 -05:00
5f14d6675f
Fix shard values
2015-12-15 14:56:19 -05:00
07f610d4bd
More Fixes
2015-12-15 14:45:12 -05:00
607c164753
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
2015-12-15 13:55:01 -05:00
92b82d786b
Don't give Winter Holiday Chests to offline players
2015-12-15 13:34:47 -05:00
b9a688c4e7
Update monthly bonuses
2015-12-15 13:07:49 -05:00
e3e757da8a
Fix mounts owned count
2015-12-15 13:06:11 -05:00
3edba0fac6
Fix Grinch Hat
2015-12-15 12:28:06 -05:00
f2107b7b79
Merge remote-tracking branch 'origin/develop' into develop
2015-12-15 12:07:40 -05:00
2216fdc52c
Dont disable new gadgets in games
2015-12-15 12:07:34 -05:00
40ae7743c6
reverting last "fix"
2015-12-15 14:20:21 +01:00
6a346790f7
disable tutorial
2015-12-15 12:00:56 +00:00
1da04b84b5
test push (change version to 0.17d)
2015-12-15 11:57:33 +00:00
c63bac6433
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
2015-12-15 11:42:16 +00:00
47ad563596
Spawn nametags far far away from players
2015-12-15 22:46:30 +13:00
cf58fdee4a
trying to fix the spigot Chat spam thingy.
2015-12-15 05:29:59 +01:00
871c97f7af
changed chest %'s
2015-12-15 09:25:44 +11:00
afa45c47ca
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
2015-12-14 14:23:42 +01:00
9137fcfe40
loads of changes (pvp timer, unsafe stuff)
2015-12-14 12:39:00 +00:00
0f38c7b287
increased minimum coal
2015-12-14 22:12:50 +11:00
Mysticate
Shaun Bennett
Virizion
Jonathan Williams
William Burns
libraryaddict
Sarah
NewGarbo
Cheese