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

5795 Commits

Author SHA1 Message Date
Thanos paravantis
9a1a652e85 Merge branch 'master' into thanos-mineware 
Conflicts:
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerTypePage.java
	Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
 2015-12-17 20:54:28 +02:00
Thanos paravantis
51c572bf44 Prevent game countdown if there is only one player, fix typo on Dog vs Cat challenge. 2015-12-17 20:48:55 +02:00
Thanos paravantis
d38276d23d MineWare updates and several changes on challenges. 2015-12-17 17:57:33 +02:00
William Burns
7d9b97180d Testing ArcadePlayer implementation 2015-12-17 01:48:55 +00:00
Mysticate
d28c2be1c3 Epic chnage that saved the day omg 2015-12-16 20:26:04 -05:00
William Burns
ee202bc7f5 Add MineplexPlayer -> ArcadePlayer 2015-12-16 22:32:34 +00:00
William Burns
4077aa808f Add to Arcade and Hub 2015-12-16 22:01:51 +00:00
William Burns
370c59ce75 Added custom data 2015-12-16 21:52:41 +00:00
Sarah
4e9e0243cd Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into type-wars 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
#	Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java
 2015-12-16 18:16:08 +01:00
Thanos paravantis
81f03e4b68 Update anti-hack jump fix for Bouncing Block and Arrow Rampage. 2015-12-16 17:18:19 +02:00
William Burns
baf0f254bb Custom data, waiting for JLO 2015-12-16 14:41:57 +00:00
Mysticate
d16dd4a9d2 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:35:55 -05:00
Mysticate
4566577c68 Die player cache 2015-12-15 19:26:09 -05:00
Mysticate
b36bf37197 Merge remote-tracking branch 'origin/master' into update-paintball 2015-12-15 19:22:38 -05:00
Shaun Bennett
211e440e67 Merge remote-tracking branch 'remotes/origin/master' into develop 
# Conflicts:
#	Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java
 2015-12-15 15:00:14 -05:00
Shaun Bennett
aef704d972 Slight winter reward rarity changes 2015-12-15 14:58:09 -05:00
Shaun Bennett
5f14d6675f Fix shard values 2015-12-15 14:56:19 -05:00
Shaun Bennett
07f610d4bd More Fixes 2015-12-15 14:45:12 -05:00
Thanos paravantis
7e3bcae0d4 Mineware Challenge Updates. 
- Prevent challenge from ending if all players alive have the 'spectating' property to true.
- Prevent MAC from triggering when players jump high on Bouncing Block challenge.
- Minor changes to challenge descriptions.
- Remove Evolution of Combat challenge (unused).
 2015-12-15 21:12:01 +02:00
Shaun Bennett
607c164753 Merge remote-tracking branch 'remotes/origin/clans/alpha' into develop 2015-12-15 13:55:01 -05:00
Shaun Bennett
92b82d786b Don't give Winter Holiday Chests to offline players 2015-12-15 13:34:47 -05:00
Shaun Bennett
b9a688c4e7 Update monthly bonuses 2015-12-15 13:07:49 -05:00
Shaun Bennett
e3e757da8a Fix mounts owned count 2015-12-15 13:06:11 -05:00
Shaun Bennett
3edba0fac6 Fix Grinch Hat 2015-12-15 12:28:06 -05:00
Shaun Bennett
f2107b7b79 Merge remote-tracking branch 'origin/develop' into develop 2015-12-15 12:07:40 -05:00
Shaun Bennett
2216fdc52c Dont disable new gadgets in games 2015-12-15 12:07:34 -05:00
Sarah
40ae7743c6 reverting last "fix" 2015-12-15 14:20:21 +01:00
NewGarbo
6a346790f7 disable tutorial 2015-12-15 12:00:56 +00:00
NewGarbo
1da04b84b5 test push (change version to 0.17d) 2015-12-15 11:57:33 +00:00
NewGarbo
c63bac6433 Merge branch 'clans-beta' of ssh://184.154.0.242:7999/min/Mineplex into clans-beta 2015-12-15 11:42:16 +00:00
libraryaddict
47ad563596 Spawn nametags far far away from players 2015-12-15 22:46:30 +13:00
Sarah
cf58fdee4a trying to fix the spigot Chat spam thingy. 2015-12-15 05:29:59 +01:00
Cheese
871c97f7af changed chest %'s 2015-12-15 09:25:44 +11:00
Sarah
afa45c47ca Merge branch 'develop' of http://184.154.0.242:7990/scm/min/mineplex into pregametutorial 2015-12-14 14:23:42 +01:00
NewGarbo
9137fcfe40 loads of changes (pvp timer, unsafe stuff) 2015-12-14 12:39:00 +00:00
Cheese
0f38c7b287 increased minimum coal 2015-12-14 22:12:50 +11:00
Cheese
951cd65903 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 22:05:22 +11:00
Cheese
045bc760c2 increassed cooldown, people getting trapped perm 2015-12-14 22:05:08 +11:00
Cheese
809ff649be lowered rarities a bit 2015-12-14 22:03:09 +11:00
Shaun Bennett
7181a26e58 Remove pointless equals() 2015-12-14 05:56:39 -05:00
Cheese
9e72e5adf1 nicer text 2015-12-14 21:43:11 +11:00
Cheese
daa9f165b1 removed coins from gadgets 2015-12-14 21:41:47 +11:00
Cheese
52394c89dd fixed skins beign wrong way around 2015-12-14 21:34:27 +11:00
Cheese
0ecd5a05f5 fixed hat ownership 
reduced coal cost
 2015-12-14 21:32:06 +11:00
Cheese
00de6880ba fixed wrong types 2015-12-14 21:25:30 +11:00
Cheese
342e9f2345 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 20:53:49 +11:00
Cheese
1189535748 icon fixes 2015-12-14 20:53:34 +11:00
Shaun Bennett
816c057eb3 Notify server about opening chest 2015-12-14 04:49:44 -05:00
Shaun Bennett
6ec8ec4c01 Merge pull request #97 in MIN/mineplex from william-gladiators to master 
* commit 'd91e4ab4f756746b31c7ebdd3e7d33c139ea7d30':
  Another door bug, and a title fix.
  Health looks nicer.
  Bug fixes. Title shortened.
 2015-12-14 03:45:55 -06:00
Shaun Bennett
daf1d29ce0 Fix Carl 2015-12-14 04:44:11 -05:00
Shaun Bennett
50bf97ae4a Fancy treasure changes 2015-12-14 04:19:15 -05:00
Cheese
670eaa1954 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:16:03 +11:00
Shaun Bennett
e4fd97467f More treasure changes 2015-12-14 03:14:52 -05:00
Cheese
288c20fc74 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 19:13:05 +11:00
Cheese
9e35399d1d rarities tweaked + shards 2015-12-14 19:09:55 +11:00
Shaun Bennett
db9db558a0 Update GUI slots 2015-12-14 02:56:07 -05:00
Shaun Bennett
4afca01ad0 Treasures! 2015-12-14 02:49:51 -05:00
Cheese
c508b5ea96 chest visuals 2015-12-14 18:13:19 +11:00
Shaun Bennett
063c87c4fe Merge remote-tracking branch 'origin/master' 2015-12-14 00:29:11 -05:00
Shaun Bennett
cdbcae7e3e Cosmetic Menu Update 2015-12-14 00:28:28 -05:00
Cheese
048a9a81b8 gadget ammo should no logner be purchasable 2015-12-14 16:20:39 +11:00
Cheese
7f9e5c4ec9 more coal 2015-12-14 16:06:49 +11:00
Cheese
f6f04fe256 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-14 16:04:05 +11:00
Cheese
55fffdad59 fixed some colors 2015-12-14 16:03:51 +11:00
Shaun Bennett
e8b0e5dd8e Fix IntellIJ Files 2015-12-13 23:51:47 -05:00
Shaun Bennett
8e31c79c58 Merge remote-tracking branch 'origin/master' 2015-12-13 23:46:46 -05:00
Cheese
bccade55bc reduced coal fumes size 2015-12-14 15:43:45 +11:00
Shaun Bennett
5be91de006 Merge master 2015-12-13 23:40:18 -05:00
Cheese
f26c31b7ec xmas a little harder 2015-12-14 15:33:09 +11:00
Shaun Bennett
fe3431ba04 Cosmetic Menu Update 2015-12-13 23:31:21 -05:00
Cheese
1073981778 Merge branch 'master' into update-xmaschaos 2015-12-14 15:30:15 +11:00
Cheese
94169a5b8a it made me push it :( 2015-12-14 15:29:34 +11:00
Cheese
c34ac3ec52 xmas 2015-12-14 15:21:43 +11:00
Jonathan Williams
dcf3c1ea88 Deleted and added new Cache since renaming was jacked up. 2015-12-13 23:14:17 -05:00
Mysticate
42244ae798 Snowman AI fix 2015-12-13 22:43:11 -05:00
Mysticate
a04eaddc42 Fixed bump 2015-12-13 22:25:18 -05:00
libraryaddict
f90484c37f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2015-12-14 15:43:03 +13:00
libraryaddict
b5bdf7ced4 Remove custom name on players on join and arcade spectator 2015-12-14 15:42:32 +13:00
Mysticate
0dd7db27cd FIXED FORAMTTING 2015-12-13 19:49:41 -05:00
Mysticate
a827f95eb4 Fixed scoreboard. VIVA LA FIESTA 2015-12-13 19:24:24 -05:00
Mysticate
0e9e8c155f Quick fix that I don't think i caused. 2015-12-13 19:11:06 -05:00
Mysticate
0c383f8bf4 Remove bad message 2015-12-13 18:58:03 -05:00
Mysticate
90145bf8e7 Merge branch 'master' of 
http://Mysticate@184.154.0.242:7990/scm/min/mineplex.git into
update-xmaschaos

Conflicts:
	Plugins/Mineplex.Core/.settings/org.eclipse.jdt.core.prefs
	Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
 2015-12-13 18:57:35 -05:00
Mysticate
35ab40727b XMAS UPDATE OMG :O 2015-12-13 18:55:21 -05:00
xGamingDudex
64fb2b11d8 Added fake skin data 
+Moved hats to use fake non-changing skin data
+Added Rudolph hat
+Added Grinch hat
+Added suport for fake skins on DisguisePlayer
+Tweaked PartyPopper
 2015-12-13 23:09:25 +01:00
William Burns
d91e4ab4f7 Another door bug, and a title fix. 2015-12-13 20:27:37 +00:00
Shaun Bennett
677e95a7fd Update IntellIJ grouping 2015-12-13 14:05:28 -05:00
Sarah
63f5794c79 Only fix Giant facings is prepare Phase 2015-12-13 14:31:21 +01:00
William Burns
e31124e212 Health looks nicer. 2015-12-13 13:29:46 +00:00
William Burns
4fad564e15 Bug fixes. Title shortened. 2015-12-13 12:50:06 +00:00
Cheese
b095fa9efe Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-13 21:15:32 +11:00
Cheese
011a194dc6 fixed exploit 2015-12-13 21:14:57 +11:00
libraryaddict
e7213fdb7e Remove project specific settings 2015-12-13 16:41:37 +13:00
libraryaddict
9058428484 Change ItemBuilder to have ItemFlag, change hub icons to not display weapon damage 2015-12-13 16:40:46 +13:00
Sarah
a92361f2fe some more descriptions for Tutorials 2015-12-12 20:03:35 +01:00
Thanos paravantis
4e35b398d3 Change challenge start message format. 2015-12-12 15:57:31 +02:00
Thanos paravantis
ac69b33f3e Merge branch 'MortensRawBugFixes' into thanos-mineware 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java
 2015-12-12 10:14:29 +02:00
Thanos paravantis
2773518e30 Merge branch 'MortensRawBugFixes' of http://184.154.0.242:7990/scm/min/mineplex into MortensRawBugFixes 2015-12-12 10:12:42 +02:00
Thanos paravantis
92e23b2e1b Rename method on Fast Food challenge. 2015-12-12 10:11:42 +02:00
Shaun Bennett
402530d671 Merge pull request #94 in MIN/mineplex from william-gladiators to master 
* commit '0d4bd91b573ca251d15471b6454452bd4ebca195':
  lag detection thing
  Scoreboard change and breaking blocks.
  Couple of fixes
 2015-12-11 18:57:52 -06:00