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 |
|
Cheese
|
4a0cc79abf
|
fixed silence not working in non-champs servers
|
2015-11-21 11:08:09 +11:00 |
|
Cheese
|
2f91ca5a8a
|
fixed errors
|
2015-11-21 10:35:17 +11:00 |
|
Cheese
|
4a70e4da90
|
more fixies
|
2015-11-21 10:34:08 +11:00 |
|
Cheese
|
4d128d9c7a
|
fixed some skills and wierd hitbox error
|
2015-11-21 10:29:48 +11:00 |
|
Cheese
|
c7297a7a38
|
fixed invalid proxies exploding
|
2015-11-21 09:45:01 +11:00 |
|
Cheese
|
0bc64fec16
|
Proxy limit fixes
|
2015-11-21 09:28:15 +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 |
|
AlexTheCoder
|
f51358552a
|
-B
|
2015-11-20 05:57:29 -05:00 |
|
libraryaddict
|
208d90c4bc
|
Fixed getTargetBlock being 0 when its infinite
|
2015-11-17 10:18:42 +13:00 |
|
Cheese
|
60a6a81587
|
faster cleanup
|
2015-11-14 13:03:41 +11:00 |
|