NewGarbo
|
5744178286
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-27 04:06:02 +00:00 |
|
NewGarbo
|
dbda29e3f3
|
magnetic maul fixes
|
2015-11-27 04:05:47 +00:00 |
|
NewGarbo
|
73f4450fa3
|
clans fixes
|
2015-11-27 04:04:29 +00:00 |
|
Shaun Bennett
|
ef511f1704
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 22:38:03 -05:00 |
|
Shaun Bennett
|
6da10950da
|
Update clan icons, fix client class
|
2015-11-26 22:37:54 -05: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
|
e849484670
|
bunch of changes and fixes and bugs and stuff and things
|
2015-11-26 23:59:47 +00:00 |
|
NewGarbo
|
055702b36e
|
changes and fixes and woo
|
2015-11-26 23:08:33 +00:00 |
|
NewGarbo
|
56d4b34969
|
fixed formatting on death notices.
Made world event middle texts longer lasting.
Fixed logout NPC timer
|
2015-11-26 21:57:26 +00:00 |
|
NewGarbo
|
5393d1d18c
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-26 21:16:21 +00:00 |
|
Shaun Bennett
|
6e416b1059
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
|
2015-11-26 16:12:54 -05:00 |
|
Shaun Bennett
|
27e214a643
|
Region fix
|
2015-11-26 16:12:29 -05:00 |
|
NewGarbo
|
dd33d9587d
|
made power recharge a tad faster with Wind Blade
|
2015-11-26 21:12:09 +00:00 |
|
NewGarbo
|
0aaee24600
|
fixed gear UI display stuff incorrectly
|
2015-11-26 21:06:33 +00:00 |
|
NewGarbo
|
bb3ea0115d
|
fixed classes not loading
|
2015-11-26 20:41:42 +00:00 |
|
NewGarbo
|
67a28a94fb
|
bunch of fixes
|
2015-11-26 20:32:01 +00:00 |
|
Sarah
|
9e1d522876
|
Increase Render distance on particles, Don't spawn mob until "protect him from evil minions" title appears and changing some timings.
|
2015-11-26 16:47:31 +01:00 |
|
Sarah
|
33383af18a
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:37:57 +01:00 |
|
Sarah
|
c74732af39
|
One more fix.
|
2015-11-26 16:37:18 +01:00 |
|
Sarah
|
cb67e42f96
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:27:24 +01:00 |
|
Sarah
|
21f859f579
|
fixing 2 seconds delay.
|
2015-11-26 16:26:49 +01:00 |
|
Sarah
|
efc05803ac
|
Minion spawn.
|
2015-11-26 16:25:44 +01:00 |
|
Sarah
|
40259a26f1
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:12:51 +01:00 |
|
Sarah
|
a653f053a5
|
Adding 2 Seconds delay.
|
2015-11-26 16:12:13 +01:00 |
|
Sarah
|
9f3c3589b2
|
Particle render distance.
|
2015-11-26 16:09:29 +01:00 |
|
Sarah
|
3128a6005b
|
Merge branch 'pregametutorial' of http://184.154.0.242:7990/scm/min/mineplex into type-wars
|
2015-11-26 16:06:53 +01:00 |
|
Sarah
|
eddbde5ebd
|
Changing length formula.
|
2015-11-26 16:06:15 +01:00 |
|
NewGarbo
|
2bce722539
|
some code polishing. fixed some mispositioning with Spawn holograms.
|
2015-11-26 13:29:40 +00:00 |
|
NewGarbo
|
e5fa59b8da
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-11-26 13:17:28 +00:00 |
|
NewGarbo
|
009ddaaee1
|
stop players in tutorial from receiving/sending chat.
|
2015-11-26 13:16:50 +00:00 |
|
NewGarbo
|
bbfd319bcd
|
Spawn holograms
|
2015-11-26 13:14:10 +00:00 |
|
NewGarbo
|
1ce2a362c6
|
disallow item frames being rotated in Spawn
|
2015-11-26 12:34:12 +00:00 |
|
NewGarbo
|
be19c17fee
|
fixed gem -> gold conversion rate
|
2015-11-26 12:33:29 +00:00 |
|
NewGarbo
|
9aaad0b4a1
|
fixed formatting in /spawn command
|
2015-11-26 12:31:55 +00:00 |
|
Shaun Bennett
|
bdc08676d9
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/regions/ClansRegions.java
|
2015-11-26 03:34:33 -05:00 |
|
Shaun Bennett
|
d4f3786b1c
|
Fixes
|
2015-11-26 03:31:03 -05:00 |
|
NewGarbo
|
94a0f3244d
|
corrected typo in WindBlade.java
|
2015-11-26 07:53:37 +00:00 |
|
NewGarbo
|
af0df835b8
|
Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/items/legendaries/WindBlade.java
|
2015-11-26 07:52:35 +00:00 |
|
NewGarbo
|
97e903f403
|
updated regions
|
2015-11-26 07:51:10 +00:00 |
|
Shaun Bennett
|
75ff5bb3da
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 02:46:56 -05:00 |
|
NewGarbo
|
56d5c10481
|
oops util ent new method didn't commit in last commit
|
2015-11-26 07:29:59 +00:00 |
|
NewGarbo
|
c0cfdf9785
|
fixed windblade not recharging whilst jumping
|
2015-11-26 07:29:39 +00:00 |
|
NewGarbo
|
e80c1097b5
|
corrected regions
|
2015-11-26 07:08:30 +00:00 |
|
NewGarbo
|
0d43ffc7b2
|
fixessss
|
2015-11-26 06:54:49 +00:00 |
|
Shaun Bennett
|
6de7b8a73e
|
Merge remote-tracking branch 'origin/clans-beta' into clans-beta
|
2015-11-26 01:46:43 -05:00 |
|
NewGarbo
|
972a2d151a
|
simplified combat log npc title
|
2015-11-26 06:21:01 +00:00 |
|
NewGarbo
|
f92849f796
|
that doesn't do what i thought it did
|
2015-11-26 05:32:59 +00:00 |
|