Sarah
|
816da0f633
|
Fixing Gems
|
2015-12-20 12:00:32 +01:00 |
|
Sarah
|
f1188529f2
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:09:26 +01:00 |
|
Sarah
|
c56cd0d56e
|
adjusting some timings
|
2015-12-19 13:08:53 +01:00 |
|
Sarah
|
35966d88cf
|
Fixing Tutorial Minion
|
2015-12-19 13:05:39 +01:00 |
|
Sarah
|
7327d9463f
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 13:00:49 +01:00 |
|
Sarah
|
8a54388480
|
fixing last commit
|
2015-12-19 13:00:12 +01:00 |
|
Sarah
|
32a0dd6668
|
adding Tutorial notification
|
2015-12-19 12:59:37 +01:00 |
|
Sarah
|
152e759c10
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 12:56:05 +01:00 |
|
Sarah
|
7cb002ca86
|
Adding Tutorial notification
|
2015-12-19 12:55:28 +01:00 |
|
Sarah
|
f8bffc9f88
|
nuke delay and Stats
|
2015-12-19 12:45:06 +01:00 |
|
Sarah
|
b3afa0094e
|
Fixing some nuke stuff, Giant noises only for own Team and "Giant under attack message", spelling fixes
|
2015-12-19 00:59:15 +01:00 |
|
Sarah
|
dab2416ccd
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-12-19 00:49:16 +01:00 |
|
Sarah
|
6c5e3d7509
|
Fixing visibility.
|
2015-12-19 00:48:42 +01:00 |
|
Sarah
|
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 |
|
Shaun Bennett
|
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 |
|
Shaun Bennett
|
aef704d972
|
Slight winter reward rarity changes
|
2015-12-15 14:58:09 -05:00 |
|
Shaun Bennett
|
5f14d6675f
|
Fix shard values
|
2015-12-15 14:56:19 -05:00 |
|
Shaun Bennett
|
07f610d4bd
|
More Fixes
|
2015-12-15 14:45:12 -05:00 |
|
Shaun Bennett
|
607c164753
|
Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop
|
2015-12-15 13:55:01 -05:00 |
|
Shaun Bennett
|
92b82d786b
|
Don't give Winter Holiday Chests to offline players
|
2015-12-15 13:34:47 -05:00 |
|
Shaun Bennett
|
b9a688c4e7
|
Update monthly bonuses
|
2015-12-15 13:07:49 -05:00 |
|
Shaun Bennett
|
e3e757da8a
|
Fix mounts owned count
|
2015-12-15 13:06:11 -05:00 |
|
Shaun Bennett
|
3edba0fac6
|
Fix Grinch Hat
|
2015-12-15 12:28:06 -05:00 |
|
Shaun Bennett
|
f2107b7b79
|
Merge remote-tracking branch 'origin/develop' into develop
|
2015-12-15 12:07:40 -05:00 |
|
Shaun Bennett
|
2216fdc52c
|
Dont disable new gadgets in games
|
2015-12-15 12:07:34 -05:00 |
|
Sarah
|
40ae7743c6
|
reverting last "fix"
|
2015-12-15 14:20:21 +01:00 |
|
NewGarbo
|
6a346790f7
|
disable tutorial
|
2015-12-15 12:00:56 +00:00 |
|
NewGarbo
|
1da04b84b5
|
test push (change version to 0.17d)
|
2015-12-15 11:57:33 +00:00 |
|
NewGarbo
|
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 |
|
libraryaddict
|
47ad563596
|
Spawn nametags far far away from players
|
2015-12-15 22:46:30 +13:00 |
|
Sarah
|
cf58fdee4a
|
trying to fix the spigot Chat spam thingy.
|
2015-12-15 05:29:59 +01:00 |
|
Cheese
|
871c97f7af
|
changed chest %'s
|
2015-12-15 09:25:44 +11:00 |
|
Sarah
|
afa45c47ca
|
Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial
|
2015-12-14 14:23:42 +01:00 |
|
NewGarbo
|
9137fcfe40
|
loads of changes (pvp timer, unsafe stuff)
|
2015-12-14 12:39:00 +00:00 |
|
Cheese
|
0f38c7b287
|
increased minimum coal
|
2015-12-14 22:12:50 +11:00 |
|
Cheese
|
951cd65903
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 22:05:22 +11:00 |
|
Cheese
|
045bc760c2
|
increassed cooldown, people getting trapped perm
|
2015-12-14 22:05:08 +11:00 |
|
Cheese
|
809ff649be
|
lowered rarities a bit
|
2015-12-14 22:03:09 +11:00 |
|
Shaun Bennett
|
7181a26e58
|
Remove pointless equals()
|
2015-12-14 05:56:39 -05:00 |
|
Cheese
|
9e72e5adf1
|
nicer text
|
2015-12-14 21:43:11 +11:00 |
|
Cheese
|
daa9f165b1
|
removed coins from gadgets
|
2015-12-14 21:41:47 +11:00 |
|
Cheese
|
52394c89dd
|
fixed skins beign wrong way around
|
2015-12-14 21:34:27 +11:00 |
|
Cheese
|
0ecd5a05f5
|
fixed hat ownership
reduced coal cost
|
2015-12-14 21:32:06 +11:00 |
|
Cheese
|
00de6880ba
|
fixed wrong types
|
2015-12-14 21:25:30 +11:00 |
|
Cheese
|
342e9f2345
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-12-14 20:53:49 +11:00 |
|
Cheese
|
1189535748
|
icon fixes
|
2015-12-14 20:53:34 +11:00 |
|
Shaun Bennett
|
816c057eb3
|
Notify server about opening chest
|
2015-12-14 04:49:44 -05:00 |
|
Shaun Bennett
|
6ec8ec4c01
|
Merge pull request #97 in MIN/mineplex from william-gladiators to master
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
Another door bug, and a title fix.
Health looks nicer.
Bug fixes. Title shortened.
|
2015-12-14 03:45:55 -06:00 |
|
Shaun Bennett
|
daf1d29ce0
|
Fix Carl
|
2015-12-14 04:44:11 -05:00 |
|
Shaun Bennett
|
50bf97ae4a
|
Fancy treasure changes
|
2015-12-14 04:19:15 -05:00 |
|