JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,450 Commits 1 Branch 0 Tags 481 MiB
Commit Graph

8450 Commits

Author SHA1 Message Date
xXVevzZXx 73d8aec494 fix breakable Armor in Wizards 2016-06-11 00:21:04 +02:00
xXVevzZXx b13b354ce7 Merge branch 'develop' of github.com:Mineplex-LLC/Minecraft-PC into bugfix/general-bugfixes 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java
 2016-06-11 00:20:38 +02:00
Shaun Bennett 6964b1f266 Booster gui command 2016-06-10 17:20:23 -05:00
Shaun Bennett e6920b4549 Work on booster gui, display wait time 2016-06-10 17:17:43 -05:00
Shaun Bennett ceb4de8b35 Load booster groups for arcade 2016-06-10 16:33:53 -05:00
Thanos Paravantis 6d380c6c6f Rename building champion to Speedy Builders 2016-06-10 22:44:13 +03:00
cnr 06cee364fc Merge branch 'mopple' into develop 2016-06-10 14:12:07 -05:00
Shaun Bennett 0a204a3b90 Use redis pub/sub to send booster updates 2016-06-10 12:44:27 -05:00
LCastr0 f8def923bb Merge pull request #91 from Mineplex-LLC/develop 
Merge develop into project-cosmetics
 2016-06-10 13:52:59 -03:00
Sam 739fcdc649 Fixes the problem where players could not fire a bow in OITQ 
Users with high latency were not able to fire bows.
 2016-06-10 16:29:27 +01:00
Thanos Paravantis f47d2abd87 Hide map quicker from players 2016-06-10 16:44:51 +03:00
Thanos Paravantis f277e5ca9a Fix diamond hunt map creation 2016-06-10 16:44:11 +03:00
Thanos Paravantis 1ed27e72a6 Use resetBlock method to set air blocks 2016-06-10 16:08:06 +03:00
Thanos Paravantis 5b021d3ecc Update all challenges to use new set block method 2016-06-10 16:03:33 +03:00
Thanos Paravantis 00f14131df Update treasure digger to use new set block method and apply minor improvements on chicken attack 2016-06-10 15:11:48 +03:00
Thanos Paravantis 47c4e57ce4 Fix unexpected challenge end 2016-06-10 13:33:20 +03:00
Thanos Paravantis 52ce640391 Merge branch 'develop' into thanos-mineware 2016-06-10 12:15:54 +03:00
Thanos Paravantis b08abf9a73 Apply zombie infection improvements (wip) 2016-06-10 12:13:01 +03:00
Shaun Bennett e30cd6747b Increase goal 10 million, probably need to change later 2016-06-09 23:40:58 -05:00
Shaun Bennett 1d365d726c brawl fountain now displays proper info on the weekend 2016-06-09 23:40:58 -05:00
Shaun Bennett 08e47b4b1b Enable tips in bonus gui 2016-06-09 22:41:41 -05:00
Shaun Bennett 8bf26dbc11 Use a better podium for NPC, reenable boosters 2016-06-09 18:57:48 -05:00
Shaun Bennett 35e1c2af65 Use rewardCoinsLater for giving shards 2016-06-09 18:19:22 -05:00
Alex-The-Coder 77e9de0f8f Update required rank in 
fountain add help message
 2016-06-09 17:02:00 -05:00
Alex-The-Coder 0306f1d703 Update required rank in 
booster command help message
 2016-06-09 17:02:00 -05:00
Alex-The-Coder dbe8f39eeb Update required rank in 
add booster help message
 2016-06-09 17:02:00 -05:00
xXVevzZXx f6b60ad956 fix idle manager to persist teleports and make xp rewards depending on playtime 2016-06-09 15:51:27 -05:00
cnr ba319599ba Fix fountain schematic file paths 2016-06-09 01:18:09 -05:00
Shaun Bennett 91f6ddce55 Add some minor documentation 2016-06-09 00:48:44 -05:00
Shaun Bennett 611cb28d1a Fix a typo 2016-06-09 00:47:03 -05:00
Shaun Bennett cade7b4081 Remove got boosters message 2016-06-09 00:43:59 -05:00
Shaun Bennett d6bce63967 Use schematics from update folder 2016-06-09 00:43:03 -05:00
Shaun Bennett ece08c23a9 Fix merge issues 2016-06-09 00:40:05 -05:00
Shaun Bennett 699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems 
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java
 2016-06-09 00:39:39 -05:00
Shaun Bennett d4ac309daa Merge remote-tracking branch 'remotes/origin/master' into feature/gems 2016-06-09 00:29:27 -05:00
Shaun Bennett 83be0d7efe Disable game boosters in arcade 2016-06-09 00:28:48 -05:00
Shaun Bennett 85829d355d Fix command permissions 2016-06-09 00:25:54 -05:00
Shaun Bennett 22bb56dfda Remove game booster button 2016-06-09 00:22:54 -05:00
Shaun Bennett 09d2c00f66 Proper display of extra gem fountain rewards 2016-06-09 00:14:01 -05:00
cnr cf6e3cf05d Merge branch 'feature/game-variants' into develop 2016-06-08 22:47:16 -05:00
Shaun Bennett c9d5b91c52 Proper booster activation events 2016-06-08 19:22:25 -05:00
xXVevzZXx ce8c8543f6 fix game class not beeing added to modable classes 2016-06-09 01:11:19 +02:00
xXVevzZXx b66b459e05 implement xp multiplier 2016-06-08 23:40:48 +02:00
cnr d54bed150e Merge branch 'mopple' into develop 2016-06-08 12:59:06 -05:00
xXVevzZXx 1aba217c55 slowly increase spider energy 2016-06-08 12:51:07 -05:00
xXVevzZXx aa1c599b5e Disable particles in DMT, disable Monster Damage in OITQ, fix teleport out minion despawning, horsman description, ice melting in master builders and energy draining for spider leap in SSM 2016-06-08 12:51:07 -05:00
Shaun Bennett 37a412f1bf Starting to merge boosters into arcade code 2016-06-07 17:24:24 -05:00
xXVevzZXx 9e88174c36 slowly increase spider energy 2016-06-07 00:19:56 +02:00
Sam 7da009d133 Revert "Space in front of disguised player's names when rank = all" 
This reverts commit 3bcfe22835.
 2016-06-06 21:10:51 +01:00
Sam 3bcfe22835 Space in front of disguised player's names when rank = all 
Fixes a small problem where there would be a space in front of a user's
name if they were disguised as a player with a rank of ALL.
 2016-06-06 21:06:40 +01:00