AlexTheCoder
|
30287a0832
|
Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into ben/champions-gi-balancing
|
2016-07-11 14:46:08 -04:00 |
|
AlexTheCoder
|
69c9ef8074
|
Implement small ability tweaks for Game Insights team
|
2016-07-11 14:45:54 -04:00 |
|
AlexTheCoder
|
eccd7deedc
|
Fix merge errors and properly force disable particles by checking the game's settings
|
2016-07-05 17:25:01 -04:00 |
|
AlexTheCoder
|
1ce6f3f65f
|
Stop webs from editing banners (PC-610)
|
2016-07-02 18:16:04 -04:00 |
|
LCastr0
|
24186d9992
|
More fixes for gadget persistence
|
2016-06-28 18:11:00 -03:00 |
|
LCastr0
|
83f4b25887
|
Testing persistence fixes
|
2016-06-25 00:33:36 -03:00 |
|
cnr
|
3433e0e3bc
|
Merge branch 'project-cosmetics' into develop
|
2016-06-23 18:42:47 -05:00 |
|
LCastr0
|
7749314e64
|
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
|
2016-06-23 16:11:49 -03:00 |
|
samczsun
|
956cfeac44
|
Don't recall if player is dead, show UUID for custom items
|
2016-06-22 21:14:50 -04:00 |
|
Shaun Bennett
|
d4ac309daa
|
Merge remote-tracking branch 'remotes/origin/master' into feature/gems
|
2016-06-09 00:29:27 -05:00 |
|
LCastr0
|
cb71bf4ba5
|
Removes morphs from gadget persistence (PC-429)
|
2016-06-05 17:44:34 -03:00 |
|
Ben
|
1778bd4c28
|
Final little tweaks to Champions
|
2016-06-04 18:28:38 +01:00 |
|
LCastr0
|
c5cbca3ed0
|
Merge branch 'project-cosmetics' of https://github.com/Mineplex-LLC/Minecraft-PC into project-cosmetics
|
2016-06-02 18:30:22 -03:00 |
|
Shaun Bennett
|
e380354bad
|
Refactor CurrencyType
|
2016-05-29 16:34:21 -05:00 |
|
Sam Sun
|
59c26bdcd7
|
Undo leap change
|
2016-05-27 13:41:49 -04:00 |
|
Ben
|
5899933d8d
|
[Mage/LifeBonds] Make health be taken from your own rather than the nearest player with highest health. [PC-350]
|
2016-05-27 13:46:06 +01:00 |
|
LCastr0
|
255191f01a
|
Changed gadget persistence to use Player Key/Value system (Thanks to Connor)
Changed the method names for some classes
|
2016-05-26 23:58:36 -03:00 |
|
samczsun
|
daf1d1a9ba
|
Fix duplication glitch using fissure
|
2016-05-26 14:29:12 -05:00 |
|
samczsun
|
9af2c7e9f4
|
Restore hunger after Hold. Fixes PC-334
|
2016-05-24 15:38:18 -04:00 |
|
samczsun
|
516ad5a640
|
Check cancellation before continuing Takedown. Fixes PC-277
|
2016-05-24 13:15:29 -04:00 |
|
samczsun
|
14c60ec3ba
|
Delay recall by one tick. Fixes PC-328
|
2016-05-24 13:15:29 -04:00 |
|
samczsun
|
51c9301799
|
Consider leap level. Fixes PC-330
|
2016-05-24 13:15:29 -04:00 |
|
Ben
|
bad9077144
|
[Ranger/VitalitySpores] Change to if you take damage and then go 10 Seconds without taking more damage, you will receive Regen 2 for 6(+1 pl) Seconds; if you take damage during that regen you lose it [PC-354]
|
2016-05-24 11:09:05 +01:00 |
|
Ben
|
bc3ec4088a
|
[Ranger/Sharpshooter] Missing two shots causes the damage bonus to reset. [PC-352]
|
2016-05-24 01:16:11 +01:00 |
|
Ben
|
5791cc5dec
|
[Assassin/Evade] Buff the skill in multiple ways [PC-355]
|
2016-05-24 01:15:29 +01:00 |
|
Ben
|
8bb9811a80
|
[Assassin/Blink] When de-blinking set the rotation of the player to the rotation that was present at the time of the de-blinking rather than the rotation of the player when they blinked. [PC-359]
|
2016-05-24 00:28:48 +01:00 |
|
Ben
|
243044b921
|
[Skill/Assassin] Remove Rest & Fitness from. [PC-358 AND PC-357]
|
2016-05-24 00:25:32 +01:00 |
|
Ben
|
5448c42e45
|
[Assassin/Recall] Don't allow use when in water [PC-360]
|
2016-05-23 23:46:33 +01:00 |
|
Ben
|
609aa5177a
|
[Ranger/WolfsPounce] Lower damage [PC-353]
|
2016-05-23 23:45:42 +01:00 |
|
Ben
|
8da4ac3135
|
[Brute/FleshHook] Deal more damage/pull velocity when charging up more [PC-340]
|
2016-05-23 23:42:12 +01:00 |
|
Ben
|
e5b8636298
|
[Mage/Immolate] Do not allow use whilst in water [PC-351]
|
2016-05-23 01:23:08 +01:00 |
|
Ben
|
d019d27d23
|
[Mage/Blizzard] Increase energy usage. [PC-347]
|
2016-05-23 01:22:39 +01:00 |
|
Ben
|
af2eef5afe
|
[Mage/Inferno] Increase energy usage [PC-348]
|
2016-05-23 01:22:15 +01:00 |
|
Ben
|
02dc9ca3f9
|
[Brute/DwarfToss] Fix the water check being in the wrong location [PC-336]
|
2016-05-23 01:21:47 +01:00 |
|
Ben
|
48e998f630
|
[Knight/HiltSmash] Lower damage (previous commit for this ticket for some reason did not contain the lowered damage) [PC-343]
|
2016-05-23 01:01:27 +01:00 |
|
Ben
|
d8a3ebc704
|
[Knight/AxeThrow] Lower damage and increase recharge time. [PC-345]
|
2016-05-23 00:59:11 +01:00 |
|
Ben
|
2138330c70
|
[Brute/DwarfToss] Move Invulnerability condition appliance outside of the 5 tick delay as that allowed players to get attacked right after being thrown. [PC-336]
|
2016-05-23 00:57:46 +01:00 |
|
Ben
|
be007cd62f
|
[Knight/Swordsmanship] Change my previous commit for this skill a little bit, as it was clarified to be slightly different than I understood it to be. [PC-341]
|
2016-05-22 20:52:34 +01:00 |
|
Ben
|
ceab00f979
|
[Brute/BlockToss] Change recharge time and remove redundant null check. [PC-338]
|
2016-05-22 20:51:22 +01:00 |
|
Ben
|
e701e0c0db
|
[Mage/IcePrison] Lower the per level lasting time of ice. [PC-349]
|
2016-05-21 00:46:57 +01:00 |
|
Ben
|
383f9005e1
|
[Mage/MagmaBlade] Lower damage [PC-346]
|
2016-05-21 00:44:16 +01:00 |
|
Ben
|
b1933eddc7
|
[Brute/BlockToss] Increase recharge time and fix the held block hitbox blocking the holder from getting attacked. [PC-338]
|
2016-05-21 00:22:57 +01:00 |
|
Ben
|
55b0ed8eb5
|
[Knight/HiltSmash] Change base damage from 3 to 2 [PC-343]
|
2016-05-20 15:50:33 +01:00 |
|
Ben
|
8ba2132f81
|
[Knight/Swordsmanship] Buff base from 1 charge to 2 charges. [PC-341]
|
2016-05-20 15:49:57 +01:00 |
|
Ben
|
07c5e16e44
|
[Brute/Intimidation] Update lore to match the new damage distance [PC-337]
|
2016-05-20 15:07:57 +01:00 |
|
Ben
|
0883937316
|
[Knight/Riposte] Change base recharge from 10s to 14s [PC-342]
|
2016-05-20 11:06:23 +01:00 |
|
Ben
|
6020881af2
|
[Brute/CripplingBlow] Change knockback modifier from -50% to -25% [PC-339]
|
2016-05-20 11:03:15 +01:00 |
|
Ben
|
9154848ed9
|
[Brute/FleshHook] Lower base damage. [PC-340]
|
2016-05-20 10:23:45 +01:00 |
|
Ben
|
53fcab596a
|
[Brute/Intimidation] Lower range boost per level. [PC-337]
|
2016-05-20 10:17:59 +01:00 |
|
Ben
|
d52262c3fc
|
(Dwarf Toss) Add short invincibility for thrown players. Don't allow use in water. [PC-336]
|
2016-05-20 01:25:02 +01:00 |
|
Ben
|
dc7ea4e9c7
|
Brute Takedown skill nerf [PC-335]
|
2016-05-20 01:09:46 +01:00 |
|
samczsun
|
1fc4239b89
|
Determine whether Ice Prison target is valid. Fixes PC-281
|
2016-05-16 15:44:22 -05:00 |
|
phobia
|
29b3f03abf
|
Merge branch 'clans/beta' of github.com:Mineplex-LLC/Minecraft-PC into clans/beta
|
2016-04-14 21:38:48 +10:00 |
|
phobia
|
cbc6689782
|
Disable /kill in tutorial and reset food level after hold position
|
2016-04-14 21:38:37 +10:00 |
|
Ben
|
a26403f006
|
Fix Recall & Smokebomb not working regularly
|
2016-04-13 13:04:43 +01:00 |
|
Ben
|
159a5403ac
|
Fix rare item duplication bug with Smoke Bomb (was told that it's just like the Recall duplication bug)
|
2016-04-10 16:47:46 +01:00 |
|
Ben
|
fe89a5b68e
|
Fix the Recall rare item duplication bug
|
2016-04-10 14:50:00 +01:00 |
|
Ben
|
d75d63a81a
|
some missing files and blacklist barrier block from block toss
|
2016-04-06 18:26:56 +01:00 |
|
Ben
|
bdfb55d4e1
|
nevermind [revert leap change]
|
2016-03-11 21:22:01 +00:00 |
|
Ben
|
bfdb7add2e
|
run siege weapon queries async
|
2016-03-11 21:04:22 +00:00 |
|
Shaun Bennett
|
876a568bd0
|
Merge remote-tracking branch 'origin/clans/beta' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/OutpostRepository.java
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/repository/SiegeWeaponRepository.java
|
2016-03-08 12:17:07 -06:00 |
|
Shaun Bennett
|
ffd9d98d2e
|
Merge remote-tracking branch 'remotes/origin/clans/tutorial' into clans/beta
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
|
2016-03-08 12:15:47 -06:00 |
|
NewGarbo
|
ae42aaaab1
|
Sammy changes + cleanup
|
2016-03-07 03:25:22 +00:00 |
|
NewGarbo
|
7e2086df1c
|
flash fix, rares update, and outpost fixes
|
2016-03-06 19:55:58 +00:00 |
|
NewGarbo
|
67c355bf65
|
remove more eclipse files
|
2016-02-19 07:22:54 +00:00 |
|
NewGarbo
|
d5583b93f2
|
remove eclipse files
|
2016-02-19 07:14:13 +00:00 |
|
NewGarbo
|
002be01ef1
|
MAVEN TEST COMMIT
|
2016-01-31 16:21:04 +00:00 |
|
Shaun Bennett
|
50fc1f5a10
|
merge with develop
|
2016-01-29 03:44:04 -05:00 |
|
Shaun Bennett
|
d30fb8d8ef
|
Merge remote-tracking branch 'origin/clans/alpha' into clans/alpha
# Conflicts:
# Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
|
2016-01-29 03:40:28 -05:00 |
|
NewGarbo
|
1f7e1fb6cf
|
fix dupe bug and safelog
|
2016-01-23 13:40:49 +00:00 |
|
md_5
|
bb4091c7a6
|
Use Maven for Compilation
|
2016-01-20 11:20:58 +11:00 |
|
Shaun Bennett
|
9884742552
|
Fix OrderedObjectives, Starting CombatTutorial work
|
2016-01-19 16:34:51 -05:00 |
|
Shaun Bennett
|
6c055c31a0
|
Fix flashing through doors, Update to 0.18c
|
2016-01-10 20:39:56 -05:00 |
|
NewGarbo
|
04c7f2c1f1
|
made pressure plates, buttons, and levers from working with block toss
|
2016-01-10 22:20:50 +00:00 |
|
NewGarbo
|
52c4a55180
|
outpost changes, and some other things
|
2016-01-06 22:32:36 +00:00 |
|
NewGarbo
|
369687b5dd
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
Conflicts:
Plugins/Mineplex.Game.Clans/.settings/org.eclipse.jdt.core.prefs
|
2015-12-23 18:31:51 +00:00 |
|
NewGarbo
|
7ac1fd86b4
|
made pvp timer players immune to skills
|
2015-12-15 21:12:49 +00:00 |
|
libraryaddict
|
e7213fdb7e
|
Remove project specific settings
|
2015-12-13 16:41:37 +13:00 |
|
fooify
|
348f2d8e4c
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-12-03 16:31:16 -08:00 |
|
NewGarbo
|
f536bf23e5
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta
|
2015-12-01 12:06:25 +00:00 |
|
NewGarbo
|
d32e6fdb96
|
Got rid of deployed tasks. using different system now. (untested)
|
2015-12-01 11:28:14 +00:00 |
|
Jonathan Williams
|
03a1f19df9
|
Fixed memory leaks in Disguise and Recall.
Removed debug messages in ItemMapManager
|
2015-11-30 23:49:16 -06:00 |
|
Jonathan Williams
|
513810caaa
|
Fixed memory leak in MarkedForDeath
|
2015-11-30 14:26:25 -06:00 |
|
fooify
|
61df87b446
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-29 06:37:30 -08:00 |
|
Shaun Bennett
|
f82396d485
|
Clans changes/fixes
|
2015-11-29 02:41:53 -05:00 |
|
NewGarbo
|
e1be0b1dbd
|
dupe fix
|
2015-11-28 23:34:41 +00:00 |
|
fooify
|
8cdae7ce1a
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-28 09:33:47 -08:00 |
|
NewGarbo
|
a0ae500876
|
tutorial revamp [clans]
|
2015-11-28 09:03:58 +00:00 |
|
Shaun Bennett
|
6da10950da
|
Update clan icons, fix client class
|
2015-11-26 22:37:54 -05:00 |
|
NewGarbo
|
bb3ea0115d
|
fixed classes not loading
|
2015-11-26 20:41:42 +00:00 |
|
NewGarbo
|
11deec75dd
|
fixed illusion
|
2015-11-26 00:44:13 +00:00 |
|
Shaun Bennett
|
cc75bafb4c
|
Bugs and thugs
|
2015-11-25 16:45:04 -05:00 |
|
Shaun Bennett
|
ff5d828dd7
|
Merge with master, lots of clans fixes/work
|
2015-11-25 14:50:49 -05:00 |
|
Jonathan Williams
|
fbea0e702b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
|
2015-11-24 02:56:40 -06:00 |
|
Cheese
|
c5b5d07627
|
evade timing
|
2015-11-24 16:07:11 +11:00 |
|
Cheese
|
7454cf7443
|
MS + Champs bugs, balance and more
|
2015-11-24 15:23:37 +11:00 |
|
fooify
|
f8401e0eeb
|
fixed shield smash and fissure affecting spectators
|
2015-11-23 17:08:24 -08:00 |
|
fooify
|
f300fd2c98
|
Merge remote-tracking branch 'origin/master' into foo
|
2015-11-23 15:34:27 -08:00 |
|
Jonathan Williams
|
875b87e0e4
|
Fixed memory leak crashing servers.
|
2015-11-23 02:41:38 -06:00 |
|
fooify
|
205643028e
|
fixed slab issue with Assassin's Flash
|
2015-11-21 11:00:51 -08:00 |
|