Commit Graph

6258 Commits

Author SHA1 Message Date
NewGarbo bcd4480f23 stop recruits from opening trapped chests 2016-02-23 15:57:12 +00:00
NewGarbo 306e56980c remove weapon teleport fix 2016-02-23 14:44:07 +00:00
NewGarbo de4568d448 accurate-ish weapon damage tracking 2016-02-23 13:03:50 +00:00
NewGarbo f0fc2fd519 progress [testing github] 2016-02-22 20:44:00 +00:00
NewGarbo 76cf65c267 siege system changes 2016-02-22 09:34:04 +00:00
NewGarbo db7382d01e testing github? 2016-02-21 01:34:13 +00:00
NewGarbo dc5fe21f3d more npe checking 2016-02-18 21:53:55 +00:00
NewGarbo 24b834370b null pointers with siege weaponl oading 2016-02-18 21:37:13 +00:00
NewGarbo 8507bb1bd8 all progress over this week 2016-02-18 21:29:42 +00:00
NewGarbo a5de88e6ee accidentally added those ifles 2016-02-15 11:25:33 +00:00
NewGarbo e25accfba4 outpost saving and loadi9ng 2016-02-15 11:24:29 +00:00
NewGarbo 93a5ca6777 weapons need to be centered 2016-02-14 00:45:54 +00:00
NewGarbo 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
NewGarbo 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
NewGarbo 67b12f3ae2 loads of progress 2016-02-10 19:24:57 +00:00
NewGarbo b308d1759f renamed stuff to more sensible stuff. :} 2016-02-10 13:02:55 +00:00
NewGarbo 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
NewGarbo 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
NewGarbo 35f0162882 make catapults rideableeeeeee 2016-02-10 11:09:17 +00:00
NewGarbo 43cf4d38ef give player arrow back after failed territory siege declaration arrow thingy fire thingy ehh grammar is not needed at night :} 2016-02-09 21:36:58 +00:00
NewGarbo e74cefeee8 increased siege weapon placement area, and made outposts handle siege weapons that are placed within them 2016-02-09 19:59:01 +00:00
NewGarbo e782097563 shouldn't be able to fire weapons whilst in siege wait time 2016-02-09 19:49:25 +00:00
NewGarbo 2b44b88ea2 not being able to fire bow without the correct class and changed arrow to actually be an arrow 2016-02-09 19:48:48 +00:00
NewGarbo 67d1bffe82 npe and clan minimum players set for siege 2016-02-09 19:47:42 +00:00
NewGarbo 9342bee371 das ist gut 2016-02-09 17:05:59 +00:00
NewGarbo 99ece6eaea add chest with arrwos to outpost. test for clans in area 2016-02-09 05:53:37 +00:00
NewGarbo dd2fe36a3d added "Borderlands" to Clan name blacklist 2016-02-08 22:23:26 +00:00
NewGarbo 052d3c3380 siege system updates 2016-02-08 21:33:12 +00:00
NewGarbo 2c13824f9b possesive method in UtilText 2016-02-08 20:46:45 +00:00
NewGarbo b8471d7a8e getter for crater size 2016-02-08 20:46:15 +00:00
NewGarbo 3ee3059bc7 against clan needs to have a getter 2016-02-08 18:38:30 +00:00
NewGarbo 9379c4190a add against clan to outpsots and also renamed "clan" to "owner" to make it more obvious 2016-02-08 18:31:03 +00:00
Shaun Bennett 4f5625d63e Clans Alpha 1.0 changes 2016-02-05 18:42:22 -05:00
phobia 27e4ef784c WP Evade 2016-02-06 08:44:37 +11:00
NewGarbo 9dc34b5a60 better damage calculation and fixed messages for siege weapon damaging 2016-02-05 19:12:12 +00:00
phobia b0888208d1 More alphs bug fixes 2016-02-05 23:55:38 +11:00
NewGarbo e448046e4f made inv get cleared on fire 2016-02-05 10:40:53 +00:00
NewGarbo bef898afc1 final fixes (? (still broken)) 2016-02-05 01:01:10 +00:00
phobia 6291decf87 Fixes to flame and broadsword 2016-02-05 11:42:39 +11:00
NewGarbo 1b92871b93 remove annoying debug messages 2016-02-04 23:50:44 +00:00
NewGarbo 62d45d5419 fix flip starngesness 2016-02-04 23:49:02 +00:00
NewGarbo f5d826a2cb two parentheses. all it took to fix it. GRRR 2016-02-04 23:42:27 +00:00
NewGarbo 8c1ae12d19 beta stuff 2016-02-04 23:29:48 +00:00
phobia 73d4ff2639 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-05 10:12:31 +11:00
phobia 6fd9cffb01 Clans alpha bug fixes 2016-02-05 10:12:18 +11:00
NewGarbo 16012285e0 rotation fix 2016-02-04 23:11:51 +00:00
NewGarbo 6c7d08a8f9 Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-02-04 22:55:53 +00:00
NewGarbo e61b36f55c Fixed /c stuck timer taking 7 seconds instead of 2 minutes 2016-02-04 22:55:37 +00:00
NewGarbo 03da4485b3 pushing to switch to clans/alpha 2016-02-04 22:54:43 +00:00
NewGarbo bc19cf01f7 hopefully that fixes the location offset =/ 2016-02-04 22:48:11 +00:00