7b9ff288f3
nether progresssisiannsnsssss
2016-03-03 23:23:20 +00:00
73d8870daf
nether work (forgot to commit days ago oops)
2016-03-02 19:42:53 +00:00
3447354814
Dual 1.9 Fixes
2016-03-02 12:58:30 -06:00
a3b7a3269c
Merge branch 'develop' into Dual_1.9
2016-03-01 15:14:59 -06:00
0284fed2a9
Update patch
2016-02-28 13:12:59 +13:00
775b6eeffa
Merge pull request #7 from Mineplex-LLC/feature/dmt-update
...
Draw My Thing Update
2016-02-26 04:38:10 -06:00
923e51483c
Remove fill line
2016-02-26 04:29:27 -06:00
4472c52432
Fix bucket
2016-02-26 04:21:26 -06:00
268536ce68
push 4 shaun
2016-02-26 08:13:28 +00:00
e4ba5d9723
Fix colour targeting FINALLY!
2016-02-25 19:48:15 +00:00
dead7a0850
Use a different method for targeting blocks.
2016-02-25 16:09:00 +00:00
9a8c410448
Fix lore being null.
2016-02-25 15:39:18 +00:00
009d48659b
Add commands for naming items.
2016-02-25 15:29:47 +00:00
a97409b64a
Adjust max distance for targeting.
2016-02-25 15:04:19 +00:00
7f6517a823
Ignore barrier blocks when drawing.
2016-02-25 14:23:16 +00:00
fcc3e8e024
Merge branch 'develop' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:15:12 +13:00
2a9d49ccd9
Merge branch 'master' of https://github.com/Mineplex-LLC/Minecraft-PC into Dual_1.9
2016-02-25 18:11:12 +13:00
19b6c3d95f
Make sure the blocks are in the canvas.
2016-02-24 21:37:22 +00:00
a5060e014b
Replace old paint bucket recursive filling.
2016-02-24 21:34:41 +00:00
35a853a198
Remove redo/undo system as per request of @mightysigils.
2016-02-24 08:17:13 +00:00
33bf3e2e6e
Merge branches 'develop' and 'feature/dmt-update' of github.com:Mineplex-LLC/Minecraft-PC into feature/dmt-update
2016-02-24 08:03:42 +00:00
700f5ec44a
Add Redo/Undo system (WIP).
2016-02-24 07:58:50 +00:00
d524645ddd
placed the clan name hologram thingy correctly because it's inside the outpost!!!
2016-02-23 19:11:29 +00:00
d65bf965c4
fix only some blocks of outpost being reset and explosion particles not showing up
2016-02-23 18:51:34 +00:00
2956b18821
some hologram work
2016-02-23 18:45:04 +00:00
879a211a41
change siege weapon damage indicator display length
2016-02-23 17:00:14 +00:00
deb22fd4e7
add 'time till despawn' hologram on outposts and the owner clan of the outpopsts above doors
2016-02-23 16:54:07 +00:00
205e3885b8
disallow players on pvp timer to use bows
2016-02-23 16:14:56 +00:00
41e140d5ca
stop players from placing water in outposts
2016-02-23 16:07:12 +00:00
bcd4480f23
stop recruits from opening trapped chests
2016-02-23 15:57:12 +00:00
306e56980c
remove weapon teleport fix
2016-02-23 14:44:07 +00:00
de4568d448
accurate-ish weapon damage tracking
2016-02-23 13:03:50 +00:00
f0fc2fd519
progress [testing github]
2016-02-22 20:44:00 +00:00
76cf65c267
siege system changes
2016-02-22 09:34:04 +00:00
db7382d01e
testing github?
2016-02-21 01:34:13 +00:00
3a73b05895
Fix for ServerMonitor not loading database config
2016-02-20 00:48:30 -06:00
82d51a896f
Add SERVER_STATS to DBPool. Rename STATS to MINEPLEX_STATS
2016-02-19 19:54:06 -06:00
8d7453b78e
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 19:33:52 -06:00
7032568a92
Add PLAYER_STATS DBPool
2016-02-19 19:33:39 -06:00
a84f8dd2d0
Fix dbcp, tone down sentry
2016-02-19 20:28:22 +11:00
81f9ca0bc2
Fix mysql
2016-02-19 20:10:01 +11:00
6e2eea50bb
Merge remote-tracking branch 'origin/develop' into develop
2016-02-19 02:46:25 -06:00
d575266522
Fix sentry
2016-02-19 19:44:36 +11:00
3b10207503
Class.forName!
2016-02-19 02:40:14 -06:00
d3d22bbec9
Merge pull request #168 in MIN/mineplex from clans/alpha to develop
...
* commit '67c355bf652e9c802dc1e8e56b088c44cdaaac3b': (21 commits)
remove more eclipse files
remove eclipse files
moar undead fixes
Fixes to observer settings
Clans Alpha 1.0 changes
WP Evade
More alphs bug fixes
Fixes to flame and broadsword
Clans alpha bug fixes
Fixed /c stuck timer taking 7 seconds instead of 2 minutes
Fixes to TntProtection
Added safe zone protection for flame
finalized alpha patches
alpha fixes
raised war points for invasion to 25
Fixes to war point evasion
Added fix to WarPoint evasion bug + 1 dmg bug
that's not needed
MAVEN TEST COMMIT
Fixed issues with Broadsword Added max building height of 100
...
2016-02-19 01:30:09 -06:00
67c355bf65
remove more eclipse files
2016-02-19 07:22:54 +00:00
441cf702c7
Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
2016-02-19 07:22:09 +00:00
c811906a7e
REVERT: Provide option to load config from mineplex.yml, not per game folders. (reverted from commit b58ea5b51a)
2016-02-19 18:21:01 +11:00
d5583b93f2
remove eclipse files
2016-02-19 07:14:13 +00:00
7714e4960c
Use DBPool for everything
2016-02-19 00:17:38 -06:00
eab992e621
Delete SimpleStats
2016-02-18 23:01:23 -06:00
6d81e43b30
Don't print db config to System.out
2016-02-19 15:30:30 +11:00
b58ea5b51a
Provide option to load config from mineplex.yml, not per game folders.
2016-02-19 15:25:09 +11:00
dc5fe21f3d
more npe checking
2016-02-18 21:53:55 +00:00
24b834370b
null pointers with siege weaponl oading
2016-02-18 21:37:13 +00:00
8507bb1bd8
all progress over this week
2016-02-18 21:29:42 +00:00
8b1b63c8b3
Merge branch 'develop' of ssh://184.154.0.242:7999/min/mineplex into Dual_1.9
...
Conflicts:
Patches/craftbukkit.jar
2016-02-18 16:45:37 +13:00
1a1c64dc51
Fix PerkMadScientist on non game zombies.
2016-02-17 18:44:49 +11:00
b5f4055269
Fix command stack trace on unitialized arcade games.
2016-02-17 18:40:24 +11:00
3fad9c639a
Fix stack trace in master builders when clicking on a watch.
2016-02-17 18:39:26 +11:00
50f58ba3a5
Don't stack entities when a game isn't running.
2016-02-17 18:33:40 +11:00
628e77a701
Don't process empty chat messages.
2016-02-17 18:32:43 +11:00
e6c00b06ee
Fix exception in GameChatManager if an Arcade game has not been initialized.
2016-02-17 18:29:47 +11:00
e3861d3bc0
Fix NPE in TnTGenerator
2016-02-17 18:22:37 +11:00
c20e32d2c0
Merge remote-tracking branch 'origin/develop' into develop
2016-02-16 16:55:11 -06:00
684a40db41
Fix giving TITAN in Staff Server
2016-02-16 16:55:00 -06:00
1c5ae77329
Fix Valentines quick server menu button
2016-02-16 16:54:05 -06:00
8893db60d7
Fix highly annoying exception in Reindeer mount.
2016-02-16 12:46:39 +11:00
37757ad7de
Add TypeWars to MPS
2016-02-15 18:55:13 -06:00
904798ec22
Delete libraries directory/old craftbukkit jar (now in Patches folder)
2016-02-15 18:10:44 -06:00
95c22a59fd
Use DNS for chat filter
2016-02-15 16:30:57 -06:00
d1e098ca13
Merge remote-tracking branch 'origin/develop' into develop
2016-02-15 20:44:52 -06:00
15ed2570e2
Valentines final changes, Change Gift Giver achievement
2016-02-15 20:43:46 -06:00
a5de88e6ee
accidentally added those ifles
2016-02-15 11:25:33 +00:00
e25accfba4
outpost saving and loadi9ng
2016-02-15 11:24:29 +00:00
305973198c
Merge remote-tracking branch 'origin/md_5/sentry' into develop
2016-02-15 09:20:34 +11:00
d7ad2cdc58
moar undead fixes
2016-02-14 12:37:37 +11:00
93a5ca6777
weapons need to be centered
2016-02-14 00:45:54 +00:00
24254635a8
Fixes to observer settings
2016-02-14 09:51:59 +11:00
e6eb43ada8
PUSHING CODE BECAUSE MY HDD MIGHT BE BREAKING DOWN. THIS CODE IS UNTESTED PROBABLY DOESN'T WORK
2016-02-12 19:58:40 +00:00
0d19a8017f
Update Featured arcade game, various bug fixes
2016-02-12 06:51:30 -06:00
e8559d423a
Add Valentines Vendetta to quick server menu
2016-02-12 05:27:50 -06:00
960a0cdabb
Fix constructor error, add ValentinesGiftManager to Arcade
2016-02-12 05:06:13 -06:00
eca400278c
Support server update
2016-02-12 05:00:09 -06:00
1e596a6969
Valentines rewards
2016-02-12 04:54:09 -06:00
66aa89b5e0
Fix sheep look bug, valentines gift effects, valentines achievements
2016-02-12 04:32:26 -06:00
dfd61833b7
Valentines changes
2016-02-12 03:03:47 -06:00
4f0f81c8df
Update Courtship messages
2016-02-12 01:47:20 -06:00
d51e26a5a4
Valentines game adjustments
2016-02-12 01:34:29 -06:00
90570c1185
progress on saving outposts/wepaons so far. not finished. probably going to change it to a different format
2016-02-12 07:00:21 +00:00
d8965179f7
More valentines adjustments/fix gladiators tutorial being enabled
2016-02-11 23:01:59 -06:00
2eeddb828b
Merge pull request #165 in MIN/mineplex from virizion_speed_builder to develop
...
* commit '51d152d48473f820ab6d03586fb41f890750f645':
Perfect build all fix
Only eliminated players are guardians. Broken blocks/mobs go directly into inventory.
Stop mid game joiners from getting participation gems.
Mob egg baby fix. Also fixed non build entities from being "broken"
spec command add guardian
The infamous look direction bounce bug
Chiss' double jump mechanic
Moar fixes
Hopper item pickup fix.
2016-02-11 22:59:35 -06:00
790ed4f993
Fix tools for block type/colour selections.
2016-02-11 08:11:40 +00:00
67b12f3ae2
loads of progress
2016-02-10 19:24:57 +00:00
b3045d38e7
Add colour selection for multiple block types.
2016-02-10 16:34:00 +00:00
b308d1759f
renamed stuff to more sensible stuff. :}
2016-02-10 13:02:55 +00:00
2be917e623
give enemy info about time before siege and after outpost is built, the health of the outpost
2016-02-10 13:01:31 +00:00
69bdbdde70
Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
...
Conflicts:
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Clans.java
Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/ClansManager.java
2016-02-10 11:54:36 +00:00
35f0162882
make catapults rideableeeeeee
2016-02-10 11:09:17 +00:00
eebe25040e
cleaned the particle effects a bit
2016-02-10 16:31:25 +11:00
NewGarbo
Shaun Bennett
git
Shaun Bennett
William Burns
md_5
phobia
Cheese