Cheese
d9a8d2b6ab
ore changes
2015-06-26 10:36:45 +10:00
Jeremiah Bishop
0342a5ac61
Fixed Achievements
...
Reordered Kits
Added new Kit
etc, etc, etc...
2015-06-25 19:03:25 -04:00
Cheese
2179795677
Merge branch 'SkyWars' of ssh://184.154.0.242:7999/min/Mineplex into SkyWars
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/data/TNTGenerator.java
2015-06-25 20:48:34 +10:00
Cheese
2bf1faa70d
fixed a few skywars bugs
...
added ore generation (but theres some wierd bug, still working on it)
2015-06-25 20:24:31 +10:00
Jonathan Williams
5bdb90b459
Changed disguise perm to YOUTUBE
2015-06-25 04:57:56 -05:00
Jeremiah Bishop
ed667fedee
Added more achievements
2015-06-24 22:59:28 -04:00
Jeremiah Bishop
cd10a2ad79
Fixed both kits
...
Added game achievements.
2015-06-24 20:08:31 -04:00
Jeremiah Bishop
5b4a3249ca
Added chest loot and such.
2015-06-22 21:42:45 -04:00
Jeremiah Bishop
03c45116ef
Various fixes, and added the new data to Zoologist kit
2015-06-21 23:38:25 -04:00
Jeremiah Bishop
a05c2d085d
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SkyWars
2015-06-21 16:17:51 -04:00
Jeremiah Bishop
e12ff7ef7d
Fixed?
2015-06-20 22:20:30 -04:00
Jeremiah Bishop
3cf1297d89
Added SkyWars ;)
2015-06-20 22:08:15 -04:00
Jonathan Williams
91b5beaff2
Fixed new Chat constructor requirement.
2015-06-20 03:43:38 -05:00
Aaron Brock
8ea23f96fc
Froze time using doDayNightCycle instead of setting the time on UpdateEvent.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:36:05 -04:00
Aaron Brock
1f0accd2a1
Fixed a little boolean derp that stopped people from breaking blocks.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-20 01:09:21 -04:00
Cheese
478a3c8591
some champs fixes/balance
...
duplicate message improvement
2015-06-20 15:00:16 +10:00
Cheese
2c43dc76c9
DMT no longer effected by 3s chat delay
...
Minestrike no longer has 'terrorists'
Jr.Dev rank up!
2015-06-20 11:12:24 +10:00
Aaron Brock
61494f93ba
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into bench
2015-06-19 18:13:48 -04:00
Cheese
8a224950b3
Added sale notifications
...
Added 3s chat delay
2015-06-19 13:27:59 +10:00
Aaron Brock
76e4dc6056
Stopped blocks from dropping and stopped people from breaking the other teams blocks with their fist.
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-18 19:50:06 -04:00
Jeremiah Bishop
dd9e6a6866
Started adding SkyWars game mechanics
2015-06-18 14:54:26 -04:00
Cheese
9a3a014dd5
removed debug!
2015-06-18 12:04:49 +10:00
Aaron Brock
41e77b1ade
Fixed double-half-slabs (line 68)
...
Signed-off-by: Aaron Brock <TheMineBench@gmail.com>
2015-06-17 20:49:35 -04:00
Cheese
6886484d79
Fixed Micro Battles lag (stupid lava)
...
cmds for jnr devs
smaller head hitbox in MS
added MB to parser plugin
2015-06-17 13:02:12 +10:00
Cheese
3014521e79
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-17 10:43:01 +10:00
libraryaddict
b0c026e67c
Mineware: Commit what I have, fix DisguiseVillager not extending agable and adding new option to disable auto respawn
2015-06-16 14:01:52 +12:00
Cheese
a141cec104
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-06-11 08:57:04 +10:00
Cheese
390ffcab6d
bridges support for lillypads map
2015-06-11 08:56:32 +10:00
Shaun Bennett
a20f41be09
Merge remote-tracking branch 'origin/master'
2015-06-09 13:21:26 -05:00
Shaun Bennett
3f9010fb7a
Fix GameScore comparator
2015-06-09 13:21:15 -05:00
libraryaddict
2971761a5e
Game stop command: Move unregister of game listener after the gamestate has been changed
2015-06-09 22:19:03 +12:00
libraryaddict
1f08c989b5
Minestrike: Enforce resource pack
2015-06-09 03:31:24 +12:00
libraryaddict
8cf10afb1b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-06-06 18:31:08 +12:00
libraryaddict
fd3232f45d
Mineware: Rename old MineWare and move packages
2015-06-06 18:30:47 +12:00
libraryaddict
ef9c69f356
UtilShapes: Fix a method, add a space in OldMineWare in GameType
2015-06-06 18:08:37 +12:00
libraryaddict
5f2810ae37
SurvivalGames: Fix anyone able to start game
2015-06-06 18:07:55 +12:00
Cheese
f9b49caeed
More gems for bridges/sg kills
...
Changed Al'Jaha MS name to Bombers
Added Reporting functionality to Builders
Nerfed Iron Hook
Allowed longer AFk during games
2015-06-05 12:21:20 +10:00
libraryaddict
a961e5f0d5
Wizards: Don't gain wands from stats page
2015-06-02 18:49:50 +12:00
libraryaddict
4d8a54e7ba
Wizards: Add spellbook on /spec
2015-06-02 18:49:27 +12:00
libraryaddict
bcdb851e21
Teleport: Don't disqualify staff if they are not alive
2015-06-02 18:48:45 +12:00
libraryaddict
35c005feb8
Game: add isInsideMap(Player) and have border call that on Game.java in order to have games able to define specific borders for players
2015-05-30 10:30:30 +12:00
libraryaddict
092447170e
Game Border: Fix typo that offsets border by one block
2015-05-30 10:24:15 +12:00
libraryaddict
ae41f232b0
GameType: Change to reflection for creating game instances
2015-05-30 10:23:46 +12:00
Shaun Bennett
a900a2a70a
[Arcade] Another attempt at fixing spectator gui.... :^)
2015-05-26 19:50:01 -05:00
Shaun Bennett
25ba20e411
[Arcade] Fixes for DMT and DT not counting loses properly
2015-05-26 19:28:42 -05:00
libraryaddict
e15e42afae
UHC: Expanded from 32 blocks to 36
2015-05-27 02:40:27 +12:00
libraryaddict
b8cd2aaece
UHC: Expand anti-build protection from 16 blocks to 32
2015-05-26 11:04:27 +12:00
libraryaddict
c53d52ee42
UHC: Disable gadgets
2015-05-24 20:17:39 +12:00
libraryaddict
21aa97b3b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-24 20:13:43 +12:00
libraryaddict
63e28e25c9
HoleInTheWall: Push the failed game
2015-05-24 20:10:56 +12:00
libraryaddict
0d0d5eea64
Game: Change GameFlagManager to use Game.isInsideMap(), change isInsideMap to treat MaxX,Y,Z with a +1
2015-05-24 20:10:16 +12:00
Jonathan Williams
303cfd02fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-17 23:12:27 -07:00
Jonathan Williams
f0c7f2fe76
Merge branch 'MSSQL_Conversion'
...
Conflicts:
Website/LOCWebsite.suo
2015-05-17 23:11:50 -07:00
Shaun Bennett
c107f4d0d9
[Arcade] Working on private servers
2015-05-17 16:31:09 -05:00
Shaun Bennett
5cd191f582
Merge remote-tracking branch 'origin/master'
2015-05-17 16:29:01 -05:00
Shaun Bennett
1e9abaf002
[Arcade] Add more games to private servers
2015-05-15 23:38:43 -05:00
libraryaddict
f899194e3b
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-15 12:23:27 +12:00
libraryaddict
091f98fa9d
DrawMyThing: Remove all found words from the checked string when looking for multiple guesses
2015-05-15 12:23:05 +12:00
Shaun Bennett
6b7c52cb87
[Arcade] Add additional hub clock check
2015-05-14 15:17:45 -05:00
Mini-Chiss
d390d83dd1
removed some meh words
2015-05-13 22:35:26 -05:00
Mini-Chiss
f49c2ca546
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 22:27:41 -05:00
Mini-Chiss
e68a2775e8
ex p chnage
2015-05-13 22:27:33 -05:00
libraryaddict
67f1e4ad1f
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-14 14:29:43 +12:00
libraryaddict
0fc1d680af
UHC: Add 20 seconds of invincibility on game start
2015-05-14 14:29:30 +12:00
Mini-Chiss
44cb6d8a62
increased exp more
2015-05-13 17:08:56 -05:00
libraryaddict
4bc38e3396
Arcade: Removed ocean, river and swampland from biome generation for UHC
2015-05-14 09:55:22 +12:00
libraryaddict
c46bdfd2dc
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-14 09:18:51 +12:00
libraryaddict
1b27e84e54
DrawMyThing: Fixed a check being in the wrong brackets
2015-05-14 09:18:35 +12:00
Mini-Chiss
bd58c06017
fixed being able to team with self in UHC
...
fixed eventgame admin toggle
2015-05-13 13:32:20 -05:00
Mini-Chiss
c34cac42ee
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 13:20:14 -05:00
Mini-Chiss
c26174ffa2
fixed team name
2015-05-13 13:20:05 -05:00
libraryaddict
938386bf77
Wizards: Removed chainmail loot, added gold armor instead
2015-05-13 19:14:40 +12:00
libraryaddict
20aeccb3be
Wizards: Lowered ice shards max level to 3, removed damage from web shot
2015-05-13 14:04:19 +12:00
libraryaddict
744c867990
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-13 13:19:09 +12:00
libraryaddict
d2e37df4ca
DrawMyThing: Prevented all multiple guesses, not just when it contains an accurate word
2015-05-13 13:18:54 +12:00
libraryaddict
a75aab7f98
DrawMyThing: Added more words, fixed the multiple guesses prevention never firing.
2015-05-13 13:15:53 +12:00
libraryaddict
03c384e7e6
Wizards: Remove boat from loot, fix napalm typo
2015-05-13 10:04:05 +12:00
Mini-Chiss
e1dd3a318e
UHC!!!!!
2015-05-12 15:52:19 -05:00
Shaun Bennett
32338cfce4
[MB] More words for update
2015-05-12 17:25:37 -05:00
Shaun Bennett
bdfffa3a4c
Merge remote-tracking branch 'origin/master'
2015-05-12 17:14:57 -05:00
Shaun Bennett
26db4fa269
[MB] Add more build themes
2015-05-12 16:15:44 -05:00
Mini-Chiss
2928c73767
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 14:46:30 -05:00
Mini-Chiss
e13e735246
UHC updates!
2015-05-12 14:46:21 -05:00
Shaun Bennett
c7a9ae8cd5
[Arcade] Attempt at fixing spectator gui bugs
2015-05-12 06:23:32 -05:00
Shaun Bennett
06a0f3d0d5
Merge remote-tracking branch 'origin/master'
2015-05-12 00:37:40 -05:00
Shaun Bennett
270ef37a7c
[MB] More words and more ground types
2015-05-12 00:37:13 -05:00
Mini-Chiss
ed90e97c68
removed border attack stuff
2015-05-11 21:00:38 -05:00
Shaun Bennett
9d959ee7a3
Fix/Enable Look at me Button
2015-05-11 20:46:37 -05:00
Mini-Chiss
643ed2c047
Fixed most enchants not working
...
added commands to event
minor update to snowfight to make it more fun
2015-05-11 19:55:26 -05:00
libraryaddict
214a750f6e
UHC: Add borders from SG
2015-05-12 11:01:04 +12:00
libraryaddict
a558995e12
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-12 09:52:21 +12:00
Shaun Bennett
d57bab7430
Merge remote-tracking branch 'origin/master'
2015-05-11 15:17:50 -05:00
Shaun Bennett
e799ea0909
[MB] Look at me Button (Disabled - not working properly), Villager profession button, Small bug fixes
2015-05-11 15:17:35 -05:00
Mini-Chiss
e3f2c02836
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-11 14:11:00 -05:00
Mini-Chiss
5e73441b9a
UHC world loading
2015-05-11 14:10:51 -05:00
Mini-Chiss
123af16bd2
UHC map gen
2015-05-11 13:25:05 -05:00
Shaun Bennett
c0dc531252
[MB] Allow Item Frames and Paintings
2015-05-11 12:38:21 -05:00
Mini-Chiss
5ec60d234a
UHC changes
2015-05-11 12:27:43 -05:00
Mini-Chiss
9b0736816b
UHC changes
...
abstracted out some common attribs
2015-05-11 12:21:32 -05:00
Jonathan Williams
b1a46d0f0d
Converted TaskManager
2015-05-11 01:21:27 -07:00
Shaun Bennett
46c07665e1
Merge remote-tracking branch 'origin/master'
2015-05-11 00:44:34 -05:00
Shaun Bennett
2e7428e79a
Temporary fletcher fix
2015-05-11 00:42:55 -05:00
libraryaddict
5ee3f48754
Wizards: Nerf rumble max level from level 5 to level 3
2015-05-11 14:08:40 +12:00
Mini-Chiss
3e64115f05
vote colors
2015-05-09 17:45:08 -05:00
Mini-Chiss
41599de06f
build vote update
2015-05-09 17:34:07 -05:00
Mini-Chiss
6e2b437e55
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 12:28:16 -05:00
Mini-Chiss
822718095d
cannot PM from spawn
...
first push of cards game
2015-05-09 12:23:07 -05:00
libraryaddict
7faee918af
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-09 14:13:03 +12:00
libraryaddict
0751876622
Wizards: Do a null check and event is cancelled check on damage
2015-05-09 14:12:46 +12:00
Shaun Bennett
ef86f8bb6f
merge
2015-05-08 12:22:58 -05:00
libraryaddict
689ca94c57
Wizards: Nerf rainbow beam damage, rebalance gust spell, raise armor effectiveness
2015-05-08 18:57:33 +12:00
libraryaddict
3e02806b75
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-07 02:57:20 +12:00
libraryaddict
47acf7fb85
DrawMyThing: Ignore guesses containing more than two answers.
2015-05-07 02:54:55 +12:00
Shaun Bennett
ae03743c63
Build sort of bug fix for teleported into block
2015-05-04 19:27:16 -05:00
Mini-Chiss
7505bbc1a2
gravity fix
2015-05-04 15:34:57 -05:00
Mini-Chiss
b959bcaa90
fixed 1.8 req
2015-05-04 00:56:12 -05:00
Mini-Chiss
50cd692c62
fixed wither morph damaging blocks in grav lobby
2015-05-04 00:34:03 -05:00
Mini-Chiss
fa1ac52f78
grav balance
2015-05-03 20:21:00 -05:00
Mini-Chiss
838c369b7c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 20:12:13 -05:00
Mini-Chiss
95c9be47b6
missing kit
2015-05-03 20:12:06 -05:00
Shaun Bennett
cb2666c4a5
Merge remote-tracking branch 'origin/master'
2015-05-03 20:06:19 -05:00
Shaun Bennett
af1f735a43
Add lightning packets, various gui improvements
2015-05-03 20:06:10 -05:00
Mini-Chiss
58671fa229
more words
2015-05-03 19:36:50 -05:00
Mini-Chiss
6978a176b1
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 19:10:55 -05:00
Mini-Chiss
7f0e175ba1
build update
2015-05-03 19:10:49 -05:00
Shaun Bennett
044d1098f4
Merge remote-tracking branch 'origin/master'
2015-05-03 19:10:22 -05:00
Shaun Bennett
a435ed5bae
More build changes
2015-05-03 19:10:13 -05:00
Mini-Chiss
1576085d87
more words
2015-05-03 18:33:31 -05:00
Mini-Chiss
73132d96b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 18:33:03 -05:00
Mini-Chiss
f36d7774cc
Gravity update
2015-05-03 18:32:57 -05:00
Shaun Bennett
de1f432be4
Build bug fixes
2015-05-03 18:31:56 -05:00
Shaun Bennett
74474c6227
Use itemstackfactory for formatted name
2015-05-03 18:26:20 -05:00
Shaun Bennett
f98ac0874c
Merge remote-tracking branch 'origin/master'
2015-05-03 18:22:14 -05:00
Shaun Bennett
83ff3c96aa
Close inventory when game starts
2015-05-03 18:21:59 -05:00
Shaun Bennett
fbfb5e637e
Mob Gui + Ground Change Gui + UtilSkull for special mob skulls
2015-05-03 18:18:16 -05:00
Mini-Chiss
a42c71ebb8
more 1.8 stuff
2015-05-03 16:54:02 -05:00
Mini-Chiss
bd8bd2dfd6
Abstracted kicking non-1.8 players
...
Abstracted resource pack msg
2015-05-03 16:51:13 -05:00
Mini-Chiss
40d56c3500
Converted all code to updated UtilParticle methods
...
/suicide
2015-05-03 16:37:00 -05:00
Mini-Chiss
97a86fde90
builds!
2015-05-03 15:39:15 -05:00
Mini-Chiss
a07132df49
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 15:39:04 -05:00
Shaun Bennett
73719e0df3
Fix world particles issues
2015-05-03 15:30:58 -05:00
Mini-Chiss
40c838b030
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-03 14:50:56 -05:00
Mini-Chiss
8224450b44
Build Update
2015-05-03 14:50:50 -05:00
Shaun Bennett
74dbf7e827
Merge remote-tracking branch 'origin/master'
2015-05-03 14:41:18 -05:00
Shaun Bennett
ff6da92fb7
Some Build world, support for far rendered particles
2015-05-03 14:41:09 -05:00
libraryaddict
b58bef1bd8
ResourcePack: Lengthen timeout from 10 seconds to 20 seconds
2015-05-04 04:13:23 +12:00
libraryaddict
9986bd6ee5
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-04 04:10:05 +12:00
libraryaddict
3fcec13e68
Wizards: Melee with wands should say it was wands that did it
2015-05-04 04:09:49 +12:00
Shaun Bennett
11b36e6b44
[Build] Show message to players to open inventory until they click something in their inventory
2015-05-02 22:50:27 -05:00
Mini-Chiss
9c08e57602
fixed NPE
2015-05-02 22:45:14 -05:00
Mini-Chiss
122dbad45c
added time setting and framework for lightning strikes
2015-05-02 22:26:03 -05:00
Mini-Chiss
6ad09f0ade
Master Builder update
2015-05-02 22:05:12 -05:00
Mini-Chiss
5b04d43400
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 17:45:39 -05:00
libraryaddict
08140f8863
ResourcePack: Resource pack refused now links to a forum guide
2015-05-03 08:10:25 +12:00
libraryaddict
8cb9493125
Wizards: Rainbow Road no longer lasts more than 20 seconds, cooldown never decreases
2015-05-02 16:39:20 +12:00
libraryaddict
9c268786aa
Wizards: Nerfed lightning strike damage
2015-05-02 16:22:59 +12:00
libraryaddict
efed6e129b
Wizards: Removed fishing rod from loot, fixed overtime locations not permitted to touch the highest block.
2015-05-02 16:11:57 +12:00
libraryaddict
3e9b64db66
Wizards Implode: Don't cast spell if no blocks are effected
2015-05-02 15:26:23 +12:00
libraryaddict
cd1a5793fa
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-02 15:24:16 +12:00
Jonathan Williams
707772d58b
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 22:07:33 -05:00
Jonathan Williams
2902e6075f
Fix for n positive bug.
2015-05-01 22:05:03 -05:00
libraryaddict
05c9174491
Wizards: Prevent using keyboard shortcuts to drop hotbar locked items
2015-05-02 14:59:15 +12:00
Mini-Chiss
ab6937a525
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 18:05:55 -05:00
Shaun Bennett
e04b61a91d
Give build item when game starts
2015-05-01 18:03:56 -05:00
Shaun Bennett
244ffece8a
Fixes for build game + fix clans compile
2015-05-01 18:02:06 -05:00
Shaun Bennett
910cdff935
Merge remote-tracking branch 'origin/master'
...
Conflicts:
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilParticle.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
2015-05-01 17:54:00 -05:00
Shaun Bennett
37f1f7eabb
Master Builders changes for chiss
2015-05-01 17:46:42 -05:00
libraryaddict
b136be0d47
ResourcePack: Removed code that demanded a enum and changed to boolean
2015-05-02 03:03:53 +12:00
libraryaddict
e8cbb2fc29
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 21:26:56 +12:00
libraryaddict
93a25d5a67
ResourcePack: Fixed links and declined message
2015-05-01 21:26:42 +12:00
Jonathan Williams
fb634c190e
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-05-01 02:29:54 -05:00
Jonathan Williams
e800d74976
Disabled Double Gems.
2015-05-01 02:29:20 -05:00
libraryaddict
c240a1752f
GameType: Update resource pack to use https not http
2015-05-01 19:28:42 +12:00
libraryaddict
f85d27db1a
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 19:25:11 +12:00
libraryaddict
cc65830f9b
ResourcePack: Ignore ServerGroup's resource pack and set MineStrike to use new ResourcePack code
2015-05-01 19:24:20 +12:00
Mini-Chiss
1b8ab13160
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-05-01 00:51:52 -05:00
Mini-Chiss
ba5802cc14
wizards kit availability
2015-05-01 00:47:51 -05:00
Jonathan Williams
fa4466b6a9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-05-01 00:13:39 -05:00
libraryaddict
88bd99e11f
Wizards: Update UtilTextBottom text for the custom method
2015-05-01 16:57:11 +12:00
Jonathan Williams
af86586d74
Added 'Sloth' to draw my thing list.
2015-04-30 23:57:11 -05:00
Jonathan Williams
d161d62773
Added chat filtering to private messages.
2015-04-30 23:56:08 -05:00
Mini-Chiss
21800d83c6
Build fixes
2015-04-30 23:16:30 -05:00
libraryaddict
319cde5c46
Wizards: Update resource pack url
2015-05-01 16:14:59 +12:00
libraryaddict
fbafeca150
Wizards: Remove block burn flag true
2015-05-01 15:44:11 +12:00
libraryaddict
82cd4208bd
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
2015-05-01 14:22:53 +12:00
libraryaddict
c660e0e3c7
Wizards: Re-sorted spells
2015-05-01 14:19:13 +12:00
libraryaddict
7bd133f704
Wizards: Temporary resource pack
2015-05-01 13:04:05 +12:00
Mini-Chiss
ed1c7e2336
Master Builders initial push (dont worry jon it doesnt effect anything for the update!)
2015-04-30 18:20:35 -05:00
libraryaddict
23ea7bbce4
Spectators: Set fire ticks to 0 on damage
2015-04-30 20:55:30 +12:00
libraryaddict
33bbe96964
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into Wizards
2015-04-30 01:33:43 +12:00
libraryaddict
497550549b
ResourcePackCode: Fixed the return to hub sender displaying the wrong message. Bad downloads are now sent back to hub.
2015-04-30 01:33:21 +12:00
libraryaddict
c2b7001fcc
Wizards: Current progress
2015-04-30 01:32:22 +12:00
Mini-Chiss
45b801ba81
hitbox changes
2015-04-27 19:21:33 -05:00
libraryaddict
1c1ab9bbe3
Throwing TNT: Fixed tnt not being movable from other inventories
2015-04-23 08:30:23 +12:00
libraryaddict
2aaa93e58f
ResourcePack: Add constructors to GameType for resource pack urls, sorted the enum's by name
2015-04-22 05:38:32 +12:00
libraryaddict
b29893ff60
Merge branch 'ResourcePack' into Wizards
2015-04-22 03:46:25 +12:00
libraryaddict
9f8fe3bf78
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into ResourcePack
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
2015-04-22 03:45:59 +12:00
libraryaddict
aeff6bf4b9
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-22 00:25:56 +12:00
libraryaddict
0196a5c359
Wizards: Latest changes by Chiss
2015-04-21 13:54:19 +12:00
libraryaddict
cd47da179a
Wizards: Added new food Cheese, removed other foods and raised spawn chance of remaining
2015-04-18 06:12:34 +12:00
libraryaddict
9db8aff37a
Wizards: Changed spell icons for resource pack
2015-04-18 06:10:23 +12:00
libraryaddict
25dfeacb09
Wizards: Spell levels are now viewable on items in chest as item amount
2015-04-16 16:20:01 +12:00
libraryaddict
8803941bd8
Wizards: More changes as per demand.
2015-04-16 05:51:08 +12:00
libraryaddict
073c7d16c2
Wizards Napalm: Make glazed blocks more common, raise damage
2015-04-13 15:06:52 +12:00
libraryaddict
e0b0975195
Bridge: Prevent hoppers being crafted to prevent abuse
2015-04-13 14:38:32 +12:00
libraryaddict
03fb8c203e
Wizards: Balancing
2015-04-12 23:20:15 +12:00
libraryaddict
81aeff86bf
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
2015-04-12 20:15:28 +12:00
Cheese
1378dcb815
Properly fixed MS spec bug
2015-04-11 11:45:27 +10:00
Cheese
9b2c4662c3
fixed minestrike bug where newly joined specs could buy/drop items
...
removed easter baskets
2015-04-11 11:25:25 +10:00
libraryaddict
afa372dca7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into wizards
...
Conflicts:
Plugins/Mineplex.Minecraft.Game.Core/src/mineplex/minecraft/game/core/explosion/CustomExplosion.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/SpellButton.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellLightningStrike.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/SpellSpeedBoost.java
2015-04-11 12:20:29 +12:00
libraryaddict
fc7c6e5831
Wizards changes
2015-04-11 12:11:50 +12:00
Cheese
3d95a5cfa4
bloock toss fix
2015-04-10 14:09:21 +10:00
Cheese
e0a58ba165
champions exploit fix update
2015-04-06 19:57:33 +10:00
Cheese
cdb86d3ebb
champions exploit fixes and balance
2015-04-06 17:17:36 +10:00
Cheese
6c3fc3009b
fixed sheep quest bug where players were unable to pick up sheep rapidly
...
fixed bug where falling blocks were instantly hitting players
2015-04-06 13:03:59 +10:00
Cheese
93abca0c01
can no logner break levers and other usables in SG
2015-04-04 16:12:33 +11:00
Cheese
c79432c8b9
Fixed projectile hitboxes and specific values
2015-04-04 10:54:03 +11:00
Cheese
23df6daab0
Added Easter Morph
...
Added Eggs Baskets in games
Added double gem for 1.8
2015-04-03 20:31:23 +11:00
libraryaddict
23abf92722
IcePathData: Compare Material instead of integers
2015-04-03 19:37:27 +13:00
libraryaddict
6faf5011a8
Wizards: Add spells: Gust, RainbowPath, SpectralArrow, IcePrison. Remove spells: ExplosiveRune, HealingRune, LaunchRune, Launch, TeleportRune. Explosions now launch blocks. Other changes done such as modified spells.
2015-04-03 19:33:49 +13:00
Cheese
d4e8c0c9a6
Added Respawn middle screen text
...
Added Champs capture point mid screen text
Fixed hitbox mults for projectiles
Fixed inconsistent arrow damage
Lots of Champions balance
2015-04-03 15:28:10 +11:00
Cheese
f682bb8f9c
fixed kit items not spawning
...
horse pet doesnt spawn when dead
2015-04-03 12:10:02 +11:00
libraryaddict
bb821996b1
Wizard modifications
2015-04-03 09:22:31 +13:00
Cheese
43c58bd31c
removed april fools from arcade :(
2015-04-01 20:22:13 +11:00
Cheese
3355d2b457
disabled aprilfools cow for team games
2015-04-01 19:15:11 +11:00
Cheese
5737df8d6a
final fixes for bacon brawl
2015-04-01 18:07:45 +11:00
Cheese
da9e7892f0
fixed aprilfools bugs
...
mamapig debug :(
2015-04-01 18:01:09 +11:00
Cheese
24ba42cb16
fixed armor stands blocking attacks in bacon brawl
2015-04-01 17:49:49 +11:00
Cheese
8bd883cb26
fixed damage transfer for mama pigglez kit
2015-04-01 17:43:46 +11:00
Cheese
59fce1cd88
adding some mmoooo text
...
changed pig kit for baconbrawl
2015-04-01 17:15:56 +11:00
Cheese
ed35d2a992
April Fools update
2015-04-01 16:56:13 +11:00
libraryaddict
b84756ef7a
Revert wizard commits
2015-03-27 22:13:50 +13:00
libraryaddict
a772d4cbf2
BlockHunt: Use new setInvisible method in DisguiseChicken
2015-03-27 22:05:16 +13:00
libraryaddict
a27e6fba5c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-27 06:00:14 +13:00
Cheese
821c7f0cb6
Replaced bebe piggles kit with a new kit
2015-03-26 17:43:22 +11:00
Jonathan Williams
f4061854cd
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-25 15:11:17 -07:00
Jonathan Williams
6472194d44
Optimized queries to retrieve and update player information by removing inner join calls on the account.
...
Added account id retrieval on login.
Added account id caching in redis.
2015-03-25 15:10:59 -07:00
libraryaddict
db5e6ad745
Wizards: Summoned wolves are one-hittable, and one per spell level
2015-03-25 19:25:32 +13:00
libraryaddict
be5086e2a5
Wizards: Give warning before lightning spell hits
2015-03-25 19:22:08 +13:00
libraryaddict
be542b9ce4
Rebalance wizard spell SpeedBoost
2015-03-25 19:21:38 +13:00
libraryaddict
853e6420dd
Add instant-casting to wizards
2015-03-25 19:21:20 +13:00
Cheese
4a25265c7c
Added utility methods to check for players within a sight pyramid
2015-03-25 17:13:22 +11:00
libraryaddict
4988b90d0e
Prevent TNT from being moved in inventories in PerkBomberHG
2015-03-25 16:56:37 +13:00
libraryaddict
63c55a1449
SurvivalGames: Prevent wood dropping, add mushroom soup to base loot and change bowl to soup. Add throwing tnt to loot.
2015-03-25 16:56:05 +13:00
libraryaddict
ad967a092a
Remove TNT from SG placeable and breakable
2015-03-25 16:19:56 +13:00
Cheese
9142227dd4
updates to SG border
...
balanced cleave for SG and Champs
2015-03-25 14:16:09 +11:00
Cheese
5fded981d9
Timings for Visibility
2015-03-23 16:38:17 +11:00
Cheese
46dfb532fb
Bridges scoreboard fix
...
SG balance
DONT QUIT msg improvement
2015-03-23 11:50:09 +11:00
Cheese
3f2b7444a3
made SG scoreboard display individual player names once there's less then 8
2015-03-22 10:06:11 +11:00
libraryaddict
f99edecba0
Change deathmatch color to red
2015-03-22 00:05:24 +13:00
Cheese
2bbf035d4c
SG borders now have audio and attack nearby players.
2015-03-21 12:22:47 +11:00
libraryaddict
ee7ae77311
Use VisibilityManager instead of hidePlayer showPlayer in SG Deathmatch
2015-03-21 01:38:20 +13:00
Cheese
0a766cd7bb
increased food and weapons
2015-03-20 22:23:25 +11:00
Cheese
376824edfc
slowly tnt explosion by 0.5s
2015-03-20 20:46:11 +11:00
Cheese
446951d8af
balance changes for SG
2015-03-20 20:43:42 +11:00
Cheese
57502c226f
changed slasher to barb
2015-03-20 19:39:23 +11:00
Cheese
392a648f8e
fixed cleave hurting self
2015-03-20 18:43:44 +11:00
Cheese
810517b142
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-20 18:22:10 +11:00
Cheese
cdd9400ec2
added slasher kit to SG
2015-03-20 18:21:56 +11:00
libraryaddict
f2ffc57ae2
Fix error, allow snowball and egg to do damage
2015-03-20 20:15:10 +13:00
libraryaddict
baaebd3662
Chiss wants a shorter Assassin Description
2015-03-20 19:43:27 +13:00
libraryaddict
11dcc4af8b
Fix description of Assassin Kit
2015-03-20 19:41:56 +13:00
libraryaddict
83b18129f2
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
...
Conflicts:
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-20 19:33:27 +13:00
libraryaddict
7bf9c13fd8
Kit Assassin in SG has nametag visiblity set to 8 blocks, normal set to 24
2015-03-20 19:30:08 +13:00
Cheese
6c78bc6f8f
added 10s delay on getting bow in block hunt
2015-03-20 16:51:24 +11:00
Cheese
746fa9e11b
stealer kit for SG
2015-03-20 16:20:55 +11:00
libraryaddict
6c257c1e7d
Store killed players in a hashmap in SG
2015-03-20 18:17:34 +13:00
libraryaddict
19cc6dc12b
Minor bug-fix in the hopes it fixes a major bug for SG
2015-03-20 17:51:03 +13:00
libraryaddict
6e30834565
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-20 17:35:42 +13:00
libraryaddict
03bcb120fc
Change border damage from Void to Border Damage
2015-03-20 17:35:27 +13:00
libraryaddict
3e7346618b
Change border creep speed, boats only placeable on water
2015-03-20 17:34:44 +13:00
Cheese
e4475eb7b1
allowed mapleads to stop games
...
removed nametag (long range) on wolf pet, and lowered damage from 4 to 3
2015-03-20 12:37:18 +11:00
libraryaddict
7b41649d94
Removed debug logging in SurvivalGames
2015-03-18 22:10:03 +13:00
Cheese
ee237c9f5b
re-enabled SG in gamefactory
2015-03-17 22:20:40 +11:00
libraryaddict
1f0e204eb3
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex into SurvivalGames
...
Conflicts:
Plugins/Mineplex.Core/src/mineplex/core/disguise/DisguiseManager.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wizards/spells/subclasses/HealingRune.java
2015-03-18 00:04:41 +13:00
libraryaddict
261b18fcf0
Add GameType options
2015-03-17 23:59:59 +13:00
libraryaddict
52f0941fb9
Add resourcepack options
2015-03-17 23:59:24 +13:00
libraryaddict
733134f709
Update SurvivalGames
2015-03-17 23:53:43 +13:00
libraryaddict
f12d0bf9ef
Allow disabling of game start sounds, and changing of the game PrepareTime.
2015-03-17 23:52:58 +13:00
libraryaddict
340441edbe
SG kit fletcher no longer can pickup fletched arrows
2015-03-17 18:30:48 +13:00
libraryaddict
06ebbbbc73
Remove SG wolf pet on quit
2015-03-17 18:30:17 +13:00
libraryaddict
41469b198a
Change wizards spells to use conditions for potion effects
2015-03-17 18:07:43 +13:00
Cheese
3eba559b01
fixed merge error
2015-03-17 15:02:41 +11:00
Cheese
73c66fa93f
Merge branch 'SpecRemoveCreative'
...
Conflicts:
Plugins/Mineplex.Hub/src/mineplex/hub/Hub.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventGame.java
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGames.java
2015-03-17 14:57:17 +11:00
Cheese
e3eb62887d
fixed an eventgame bug
2015-03-17 14:50:56 +11:00
Cheese
28c683a37a
fixed display for effects
2015-03-16 15:16:17 +11:00
Cheese
c941c383e7
fixed hosts not being able to use creative inventroy
2015-03-16 15:01:35 +11:00
Cheese
efa2b649bd
updated eventserver not expiring
2015-03-16 14:19:43 +11:00
Cheese
a700b61613
added WE permissions to event servers.
2015-03-16 14:10:58 +11:00
Cheese
420c4e7229
More work on Event game
2015-03-16 13:39:33 +11:00
libraryaddict
bead4a7626
No longer need to constantly set the durability of items in the sheep game
2015-03-15 13:13:06 +13:00
libraryaddict
ba04c5e834
Fixed GameScoreboard demanding strings are shortened to 15 chars when the max is 16
2015-03-15 12:35:39 +13:00
libraryaddict
e9fe1fb423
Formatted SpellType, fixed lightning spell description
2015-03-15 12:34:45 +13:00
Cheese
98960b6ce7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-13 15:40:41 +11:00
Cheese
6762e4b537
Merge branch 'SpecRemoveCreative' of ssh://184.154.0.242:7999/min/Mineplex into SpecRemoveCreative
2015-03-13 11:34:57 +11:00
Cheese
c5d48a82a3
Fixed invisibility bug
2015-03-13 11:34:45 +11:00
Shaun Bennett
b18ea22df4
Fix spectator gui bug
2015-03-12 15:50:46 -04:00
Cheese
3ceb0ff678
Converted spec away from CREATIVE
2015-03-12 15:31:40 +11:00
Shaun Bennett
f660620e4b
Revert "Pre-Frost changes"
...
This reverts commit dbeea5bf69
.
2015-03-11 22:18:29 -04:00
Cheese
bf901b2280
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-12 12:15:48 +11:00
Cheese
8e77d1fc21
more event server updates
2015-03-12 12:14:49 +11:00
libraryaddict
9cf0e4d1e8
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-03-11 13:17:16 +13:00
libraryaddict
f47447134e
Cleanup hologram class, remove witherskull option for 1.8 and fix duplicate nametags and non-invisibility on armorstands
2015-03-11 13:16:00 +13:00
Tim Ziankoski
759db08679
Revert "Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex"
...
This reverts commit 2e06a272b4
, reversing
changes made to e443b41e15
.
2015-03-09 17:24:01 -04:00
Tim Ziankoski
2e06a272b4
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-09 16:43:00 -04:00
Cheese
e443b41e15
removed unfinished code
2015-03-09 22:16:08 +11:00
Cheese
3a0e597276
more event server stuff
2015-03-09 22:15:24 +11:00
libraryaddict
dbeea5bf69
Pre-Frost changes
2015-03-09 05:17:04 +13:00
Tim Ziankoski
ac4b495301
Created internationalization helper class and began i18n process
2015-03-07 20:50:47 -05:00
Cheese
e0ba667613
old chests drop a little more frequently
2015-03-07 11:53:18 +11:00
Cheese
f2a71b2ea9
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-07 11:13:30 +11:00
Cheese
683f86bd89
event server fixes and parser gamtypes
2015-03-07 11:13:17 +11:00
Jonathan Williams
2d7f65588c
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-03-06 01:36:38 -08:00
Jonathan Williams
09ecb994f6
Pooled Friend/Ignore/Preferences/Poll/Elo repositories.
...
Removed ArcadeRepository as its unused.
Removed target server check for RedisCommand because it breaks other commands.
2015-03-06 01:36:25 -08:00
Cheese
0336df55aa
Event update
2015-03-06 19:43:17 +11:00
Cheese
e62d9774a9
Initial Event Game push
2015-03-06 19:11:26 +11:00
Jonathan Williams
5e78b43860
Added StaffOnly code to ServerConfiguration
2015-03-02 12:33:04 -08:00
libraryaddict
1fbadfa4f4
Don't compare player world to a plugin fetched world, instead compare the name.
2015-03-01 18:18:53 +13:00
Shaun Bennett
90ebbd9962
More refactors
2015-02-27 22:53:55 -05:00
Shaun Bennett
efce714375
DEVP-66 Refactor commonly used classes to Java conventions
...
Refactoring + testing jira
2015-02-26 00:07:07 -05:00
Shaun Bennett
cf7e2eed69
Merge with MPS Update
2015-02-24 21:11:16 -05:00
Shaun Bennett
ad5481ef9c
Revert "Remove arcade repository stuff"
...
This reverts commit a5f7050e40
.
2015-02-24 21:04:19 -05:00
libraryaddict
bfb0c157a2
Update jooq libraries in common.xml and EnjinTranslator.xml and eclispe classpaths
2015-02-25 13:56:32 +13:00
Shaun Bennett
be591c7d09
Disallow start/stop/kick/setgame while a game is in progress for Donor ranks
2015-02-24 17:22:47 -05:00
Shaun Bennett
857052992d
Increase max player cap to 100 for SnrMod+/Youtube
2015-02-24 14:47:10 -05:00
Shaun Bennett
570374fbb4
Add Wither Assault and Wizards gametypes to legend+ private servers
2015-02-24 14:45:31 -05:00
Shaun Bennett
48dd5639d2
Kick banned players from games
2015-02-24 14:38:12 -05:00
CoderTim
0bf6866ad7
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
2015-02-23 20:56:34 -05:00
libraryaddict
fc5771b33c
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-24 13:04:06 +13:00
libraryaddict
56e03221ad
Improve party system
2015-02-24 13:03:51 +13:00
Jonathan Williams
87558eb01a
Merge pull request #10 in MIN/mineplex from leaderboards_dev to master
...
* commit 'e1f7e2dbcc91bb79d393b09ea5b250fe895cfe11':
Remove old lines of debug code.
Add in hooks to update statistical events log for leaderboards. Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-21 01:55:59 -06:00
libraryaddict
53bb67ec4f
Magic missile nerfed to no cooldown decrease, nerfed rumble dmg, nerfed lance multihits
2015-02-21 20:41:07 +13:00
Ty Sayers
def101cc8d
Add in hooks to update statistical events log for leaderboards.
...
Modify leaderboard PHP script for new updated leaderboard table formats.
2015-02-19 18:53:46 -05:00
CoderTim
44f453c56e
Updated jOOQ and database tables
2015-02-18 18:51:36 -05:00
libraryaddict
d29b43d645
Parties now persist cross-server, staff messages now display on the sending server for other staff for staff cross-messages.
2015-02-17 15:17:14 +13:00
Mini-Chiss
cdbf6c450e
fixed mis-named gameloot chests
2015-02-15 17:35:58 +13:00
Shaun Bennett
a5f7050e40
Remove arcade repository stuff
2015-02-13 07:33:50 -05:00
libraryaddict
9bdf248643
Add cross-server message and adminmessage commands. Fixed casing on messagecommands package.
2015-02-12 04:08:06 +13:00
Shaun Bennett
e21e27f07f
Merge remote-tracking branch 'origin/master'
2015-02-10 13:33:59 -05:00
Shaun Bennett
6b3f2114f2
Holy debug code!
2015-02-10 13:27:29 -05:00
Mini-Chiss
884df48695
disguise command (not yet working fully)
2015-02-10 19:08:54 +13:00
libraryaddict
29f3241098
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-10 02:32:13 +13:00
libraryaddict
ce7db289a7
Add commands /ignore and /unignore. Fixed mutes not working with private messaging
2015-02-10 02:31:33 +13:00
Shaun Bennett
ed8638ae9f
Tablist thingy for 1.8, sort of helps the situation a bit but doesnt perfectly solve it
2015-02-06 23:39:22 -05:00
Chiss
417122b7a7
reduced rate that smash crystal spawns
2015-02-06 14:47:34 +11:00
Chiss
09b78fccd7
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
2015-02-06 14:16:26 +11:00
Chiss
14fc6f2145
Chest Update
2015-02-06 14:16:10 +11:00
libraryaddict
f549402712
Modify wizards to use | for bossbar displays
2015-02-05 23:42:26 +13:00
libraryaddict
6f8d39b630
Fixed spiders climbing liquids
2015-02-05 22:34:06 +13:00
Shaun Bennett
939c6189a7
Merge energy and war with master
2015-02-03 14:16:07 -05:00