Commit Graph

6434 Commits

Author SHA1 Message Date
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
NewGarbo 9dc34b5a60 better damage calculation and fixed messages for siege weapon damaging 2016-02-05 19:12:12 +00: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
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
NewGarbo 16012285e0 rotation fix 2016-02-04 23:11:51 +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
NewGarbo fa460dbd45 catapult rotatyyyy 2016-02-04 21:50:47 +00:00
NewGarbo 50c2da2a95 forgot to include this; version getter thingy in Clans 2016-02-04 16:10:14 +00:00
NewGarbo 5a8fae4974 stop catapult projectile from getting stuck on bounding box 2016-02-04 16:09:32 +00:00
NewGarbo ecdd21a800 version or plugin command now shows version of clans 2016-02-04 16:09:13 +00:00
NewGarbo b13494f399 more modifications to siege weapons. 2016-02-04 16:00:41 +00:00
NewGarbo c17849b751 fixed some autoboxing stuff 2016-02-03 17:30:07 +00:00
NewGarbo 4e2da061bb added protection around siege weapon 2016-02-03 17:07:06 +00:00
NewGarbo 4488b73e93 change catapult bounding box to 3 2016-02-03 17:02:31 +00:00
NewGarbo 0cb557d922 moved some stuff around and slight changes 2016-02-03 17:02:06 +00:00
NewGarbo 38cae1e3a2 catapult implemented using new siege weapon system, cannons polished up. not tested completely. don't expect this code to work fully haaha 2016-02-03 15:28:53 +00:00
NewGarbo 6bba486385 Added message if cannon is not loaded correctly 2016-02-03 11:20:11 +00:00
NewGarbo d4388870c1 fixed inventory opening on mount 2016-02-03 11:19:33 +00:00
NewGarbo 8004d0dc3c fixed npes 2016-02-03 11:06:58 +00:00
NewGarbo 95741e3029 fixed siege weapon base 2016-02-03 10:53:53 +00:00
NewGarbo 9086188280 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/ClansManager.java
2016-02-02 22:02:06 +00:00
NewGarbo 6fea76a8e4 finalized alpha patches 2016-02-02 21:38:38 +00:00
NewGarbo 23883148dd alpha fixes 2016-02-02 20:55:23 +00:00
NewGarbo cfbfb1fa3b raised war points for invasion to 25 2016-02-02 20:42:20 +00:00
NewGarbo 9fa5927240 siege weapon base progress 2016-02-02 19:41:25 +00:00
phobia 59e564cdc6 Fixes to war point evasion 2016-02-02 23:18:05 +11:00
phobia f1c49fa5ee Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-02-02 22:13:38 +11:00
phobia 8a0f585432 Added fix to WarPoint evasion bug + 1 dmg bug 2016-02-02 22:11:52 +11:00
NewGarbo 04ec8a6a26 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha
Conflicts:
	Plugins/pom.xml
2016-02-01 20:10:51 +00:00
NewGarbo 84b887fe89 that's not needed 2016-02-01 19:53:59 +00:00
NewGarbo b4ed912f7d siege weapon modular system beginnings 2016-02-01 19:52:53 +00:00
md_5 1e57f19bd6 Commons codec is not included in BungeeCord. 2016-02-01 18:18:23 +11:00
md_5 e887bbf543 Pooling with later jedis versions doesn't work on Bungee. 2016-02-01 18:13:50 +11:00
md_5 509e0609c1 Gitignore redundant Eclipse files. 2016-02-01 10:34:11 +11:00
md_5 cc1ecbe0b8 Add Eclipse magic. 2016-02-01 10:24:49 +11:00
NewGarbo 45aacd626e this isn't used anymore 2016-01-31 19:20:15 +00:00
NewGarbo cc857da88e Merge branch 'clans/alpha' of ssh://184.154.0.242:7999/min/Mineplex into clans/beta
Conflicts:
	Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilAlg.java
2016-01-31 16:27:14 +00:00
NewGarbo 002be01ef1 MAVEN TEST COMMIT 2016-01-31 16:21:04 +00:00
NewGarbo a5439943d6 Merge branch 'develop' of ssh://184.154.0.242:7999/min/Mineplex into clans/alpha 2016-01-31 15:47:52 +00:00
md_5 852f96a314 Speed up LobbyBalancer to 500ms 2016-01-31 09:45:34 +11:00
md_5 478b92db44 Add example maven settings.xml 2016-01-31 09:44:46 +11:00
Shaun Bennett b9354b7972 Remove setTestOnBorrow 2016-01-30 16:10:30 -05:00
phobia 9c83c64d01 Fixed issues with Broadsword
Added max building height of 100
2016-01-30 21:34:06 +11:00
phobia 4612550ba5 Merge branch 'clans/alpha' of http://184.154.0.242:7990/scm/min/mineplex into clans/alpha 2016-01-30 19:24:42 +11:00