Chiss
|
4386ce0b96
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
Conflicts:
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/ISkill.java
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
|
2014-03-28 14:55:13 +11:00 |
|
Chiss
|
f5ca6408f8
|
Merge?
|
2014-03-28 14:51:26 +11:00 |
Jonathan Williams
|
aae40d3899
|
Changed up Skills and SkillsPage for Dom 2 changeover.
Fixed CustomBuild stuff.
|
2014-03-27 22:17:31 -04:00 |
|
Chiss
|
47feabcad3
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-28 10:06:03 +11:00 |
|
Jonathan Williams
|
17e6658437
|
Fixed up AntiHack database reporting.
|
2014-03-24 01:16:02 -07:00 |
|
Chiss
|
2680edbd85
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-24 16:15:29 +11:00 |
|
Jonathan Williams
|
2450265909
|
Fixed damage rate limiting for mobs.
|
2014-03-22 00:16:51 -07:00 |
|
Chiss
|
e4a86e0600
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-22 10:45:01 +11:00 |
|
Chiss
|
fe09c3fc49
|
More CS Update
|
2014-03-22 10:44:31 +11:00 |
|
Jonathan Williams
|
8bf78fe14d
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-21 15:30:06 -07:00 |
|
Jonathan Williams
|
33d342b049
|
updated 1.7 stuff.
|
2014-03-21 10:57:31 -07:00 |
|
Chiss
|
ab2a72ba16
|
CS Update
|
2014-03-21 11:59:56 +11:00 |
|
Jonathan Williams
|
f24f81b7c3
|
Finished conversion.
|
2014-03-19 04:09:40 -07:00 |
|
Jonathan Williams
|
515a01fd7d
|
Updated utils.
|
2014-03-19 02:40:36 -07:00 |
|
Jonathan Williams
|
7f58453688
|
Updated Particle.
|
2014-03-19 02:25:28 -07:00 |
|
Jonathan Williams
|
7042159f46
|
Updated to 1.7 and changed namespaces to 1.7
|
2014-03-19 02:24:26 -07:00 |
|
Jonathan Williams
|
98baef09bf
|
Added 1.7 files.
Removed 1.6 files.
|
2014-03-19 00:58:43 -07:00 |
|
Chiss
|
a7888b0c02
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-19 17:51:48 +11:00 |
|
Chiss
|
7714ff4a09
|
CS Update
|
2014-03-19 17:51:37 +11:00 |
|
Jonathan Williams
|
24f1c6c722
|
Fixed saving custom builds.
Fixed items staying from previous class in game.
|
2014-03-18 23:40:54 -07:00 |
|
Jonathan Williams
|
9715f5454a
|
Removed double gems.
Removed unused code for ssm time
|
2014-03-18 12:55:04 -07:00 |
|
Chiss
|
6830033d8a
|
PLEASE JUST WORK :(
|
2014-03-16 10:52:34 +11:00 |
|
Chiss
|
d6e3f076cd
|
PLEASE JUST WORK MR TORTOISE
|
2014-03-16 10:42:30 +11:00 |
|
Chiss
|
3277a0a2f8
|
Making sure puushed
|
2014-03-16 10:35:58 +11:00 |
|
Chiss
|
d695ec72ca
|
Added SSM Team Game
|
2014-03-16 10:28:46 +11:00 |
|
Jonathan Williams
|
3603d3ef8b
|
Removed afk kick from arcade.
|
2014-03-14 21:49:01 -07:00 |
|
Jonathan Williams
|
0094c0ebeb
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-14 02:20:01 -07:00 |
|
Jonathan Williams
|
246f28a464
|
Enabled DoubleGem weekend.
Added 3 new maps
updated news
|
2014-03-14 02:19:52 -07:00 |
|
Chiss
|
aa206d9c91
|
Gravity fixes
|
2014-03-14 20:17:06 +11:00 |
|
Chiss
|
24efe3d0d8
|
SQ kit restrictions
|
2014-03-14 13:24:38 +11:00 |
|
Jonathan Williams
|
de1365b5cf
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-13 17:56:16 -07:00 |
|
Jonathan Williams
|
efee9fdcbf
|
Fixed Hub class shop.
Added chat logging.
Added message with file updater.
|
2014-03-13 17:56:05 -07:00 |
|
Chiss
|
f4cd2fcbb9
|
Staggered game teleports/start
|
2014-03-13 18:18:22 +11:00 |
|
Chiss
|
27f554ab61
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-13 16:33:03 +11:00 |
|
Chiss
|
82644002c5
|
A little bit o dem ol bug fixles. yknow what im sayin?
|
2014-03-13 16:32:48 +11:00 |
|
Jonathan Williams
|
b6ee99596a
|
Work on Dom shop page.
Removed unused shops
Removed unnecessary include of Core project files in build xml
|
2014-03-12 01:06:56 -07:00 |
|
Jonathan Williams
|
c4b7cd19c8
|
Added default builds for kits in Champions/Dominate
Added default build selection in lobby when only hitting kit and not selecting a build.
|
2014-03-11 03:29:11 -07:00 |
|
Jonathan Williams
|
f277b1da23
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/Mineplex
|
2014-03-09 19:43:14 -07:00 |
|
Jonathan Williams
|
02a1e68c8c
|
Fixed kits opening correct page.
|
2014-03-09 19:42:54 -07:00 |
|
Chiss
|
105b210afa
|
mob spawnin'
|
2014-03-10 13:42:05 +11:00 |
|
Chiss
|
464fdb1e5e
|
Renamed Champions to Dominate
|
2014-03-10 13:35:36 +11:00 |
|
Chiss
|
8593eb326e
|
Merge branch 'master' of ssh://dev1.mineplex.com:7999/min/mineplex
|
2014-03-10 13:32:52 +11:00 |
|
Chiss
|
1bc5fef625
|
Kit npc location change
|
2014-03-10 13:32:39 +11:00 |
|
Jonathan Williams
|
a565da45e4
|
Added classes to champions.
Added ability to open direct classes page.
|
2014-03-09 19:32:27 -07:00 |
|
Jonathan Williams
|
f51a6747fd
|
Moved files into Mineplex.core
Removed references to Core project.
|
2014-03-09 00:50:13 -08:00 |
|
Jonathan Williams
|
f6bda4a75f
|
publish...
|
2014-03-08 17:35:25 -08:00 |
|
Jonathan Williams
|
2cc50d5725
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2014-03-06 02:15:46 -08:00 |
|
Jonathan Williams
|
d05c2f906c
|
Fix for ServerNpc page beta join.
Work on Dom 2.0
Added sheep quest map.
|
2014-03-06 02:15:16 -08:00 |
|
Chisstop
|
60bc3f15bb
|
Merge branch 'master' of ssh://dev.mineplex.com:7999/min/Mineplex
|
2014-03-05 14:35:01 -08:00 |
|
Chisstop
|
c9a938d2c5
|
Sheep Quest Fixes
|
2014-03-05 14:34:51 -08:00 |