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 |
|
NewGarbo
|
9137fcfe40
|
loads of changes (pvp timer, unsafe stuff)
|
2015-12-14 12:39:00 +00:00 |
|
Shaun Bennett
|
c3ace42a68
|
Winter MOTD, Stat fixes (maybe?!)
|
2015-12-07 13:21:11 -05:00 |
|
Shaun Bennett
|
5c575b41fc
|
Clans alpha 0.17
|
2015-12-04 05:15:28 -05:00 |
|
NewGarbo
|
d6ca52e4a4
|
modifications
|
2015-12-02 05:11:09 +00:00 |
|
Jonathan Williams
|
633697dc7a
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-30 23:49:32 -06:00 |
|
Jonathan Williams
|
03a1f19df9
|
Fixed memory leaks in Disguise and Recall.
Removed debug messages in ItemMapManager
|
2015-11-30 23:49:16 -06:00 |
|
Cheese
|
51023a7630
|
cosmetic cooldown fix
|
2015-12-01 15:38:54 +11:00 |
|
Cheese
|
208eaf3a01
|
cosmetics recharge slowdown
|
2015-12-01 11:38:52 +11:00 |
|
Shaun Bennett
|
7c947ad97b
|
Merge master
|
2015-11-28 23:55:00 -05:00 |
|
NewGarbo
|
9ff9724fc8
|
tutorial revamp 2.0
|
2015-11-29 02:10:39 +00:00 |
|
Cheese
|
5cefe27257
|
cosmetic fixes
|
2015-11-29 11:40:19 +11:00 |
|
NewGarbo
|
aa68701ebd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-28 20:16:49 +00:00 |
|
Cheese
|
51227ae4f3
|
fixed leak
|
2015-11-29 01:25:15 +11:00 |
|
NewGarbo
|
0dceca5cfc
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-28 09:04:15 +00:00 |
|
NewGarbo
|
a0ae500876
|
tutorial revamp [clans]
|
2015-11-28 09:03:58 +00:00 |
|
Cheese
|
700cf51206
|
titan stuff almost done
|
2015-11-28 16:35:11 +11:00 |
|
Cheese
|
963caae719
|
Merge remote-tracking branch 'remotes/origin/mrsomeone12_SmallFixes'
|
2015-11-28 16:00:28 +11:00 |
|
Cheese
|
8af545af80
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitanData.java
|
2015-11-28 15:59:26 +11:00 |
|
Cheese
|
0871663498
|
titan stuff
I HATE YOU SNAKE.
|
2015-11-28 15:57:07 +11:00 |
|
Shaun Bennett
|
1a87d85174
|
Merge remote-tracking branch 'remotes/origin/master' into clans-beta
|
2015-11-27 23:13:43 -05:00 |
|
xGamingDudex
|
24f8a98545
|
Added titan particle trail.
|
2015-11-28 02:22:41 +01:00 |
|
NewGarbo
|
fe085c1571
|
loaaads of stuff
|
2015-11-27 19:42:15 +00:00 |
|
libraryaddict
|
636dcdf9f7
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountTitan.java
|
2015-11-28 05:28:04 +13:00 |
|
libraryaddict
|
5f8f643d95
|
What snake mount code I did
|
2015-11-28 05:26:43 +13:00 |
|
Shaun Bennett
|
a5ebf9b059
|
Fixes for release
|
2015-11-27 05:53:57 -05:00 |
|
Cheese
|
4e2f48b37e
|
Merge branch 'master' into clans-beta
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/items/grenades/Smoke.java
|
2015-11-27 19:16:30 +11:00 |
|
Cheese
|
f55b6761a8
|
disabled titan gadgets!
|
2015-11-27 19:14:35 +11:00 |
|
Cheese
|
77be81c216
|
pet changes
|
2015-11-27 16:50:22 +11:00 |
|
Cheese
|
2b047cdde8
|
more titan stuff
|
2015-11-27 16:46:48 +11:00 |
|
Cheese
|
05e7183b65
|
titan stuff update
|
2015-11-27 15:55:00 +11:00 |
|
NewGarbo
|
0274bf2847
|
loads of changes.
|
2015-11-27 03:28:19 +00:00 |
|
libraryaddict
|
3c98243201
|
Some more guardian stuff
|
2015-11-27 15:56:56 +13:00 |
|
libraryaddict
|
0a4416381b
|
Fix guardian
|
2015-11-27 15:55:02 +13:00 |
|
Cheese
|
98d988584d
|
titan cosmetics
|
2015-11-27 13:35:25 +11:00 |
|
NewGarbo
|
0d43ffc7b2
|
fixessss
|
2015-11-26 06:54:49 +00:00 |
|
libraryaddict
|
3e8a53562e
|
Add new hologram interaction thingy so holograms can catch interactions that they would normally block
|
2015-11-26 15:49:28 +13:00 |
|
Shaun Bennett
|
1306137cb2
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-25 14:51:00 -05:00 |
|
Shaun Bennett
|
ff5d828dd7
|
Merge with master, lots of clans fixes/work
|
2015-11-25 14:50:49 -05:00 |
|
NewGarbo
|
2adfef41ca
|
bug fixes and new stuff ( https://docs.google.com/spreadsheets/d/1jrKJIXhIF0TZvYKLyAC50IYfN8ylLZK_M8lSexEZTkc/edit#gid=0&vpid=A10 )
|
2015-11-25 16:46:53 +00:00 |
|
xGamingDudex
|
3b89d65a09
|
Merge remote-tracking branch 'origin/master' into mrsomeone12_SmallFixes
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilEnt.java
Plugins/Mineplex.Core/src/mineplex/core/mount/types/MountCart.java
|
2015-11-25 15:59:18 +01:00 |
|
libraryaddict
|
ca81265b9e
|
Readded PacketHandler debug message
|
2015-11-25 13:42:11 +13:00 |
|
Cheese
|
837be048a6
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 21:38:47 +11:00 |
|
Jonathan Williams
|
f8d8b75586
|
Changed how timings is used.
|
2015-11-24 04:36:18 -06:00 |
|
Shaun Bennett
|
ef7c26c04c
|
Clans changes
|
2015-11-23 15:57:13 -05:00 |
|
NewGarbo
|
a551e89310
|
fixed clans tips preferences, and changed World Event commands perms from being ALL to EVENT
|
2015-11-23 09:44:35 +00:00 |
|
AlexTheCoder
|
3bb11bba08
|
- Fixed Stats [caused by bad communication between chiss and I]
|
2015-11-21 11:30:53 -05:00 |
|
Cheese
|
6eb1bef1c6
|
Merge branch 'master' into minestrike-update
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
|
2015-11-21 11:09:28 +11:00 |
|
Cheese
|
d5076b1c47
|
CTF fix
|
2015-11-21 09:41:02 +11:00 |
|
AlexTheCoder
|
386032a4f5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into alex-ctf
|
2015-11-20 06:03:30 -05:00 |
|