Commit Graph

3505 Commits

Author SHA1 Message Date
Jonathan Williams 9a4bcd29a1 Fixed Sparks problems... 2015-06-27 02:26:29 -05:00
Cheese 1f34bc40a3 increased time you can hold TNT for in CS 2015-06-27 14:08:16 +10:00
Cheese 4c164ce2a6 enabled double gems 2015-06-27 12:44:43 +10:00
Cheese d0368a19d8 Players who quit early do not get full game worth of EXP. 2015-06-27 12:38:04 +10:00
Cheese 754026f403 chicken teleport fix
scientist minion name fix
2015-06-27 12:18:12 +10:00
Cheese 4183d6f21d some balance 2015-06-27 11:40:40 +10:00
Cheese 270a2e4107 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-27 11:24:33 +10:00
Cheese 4e06a1aae3 fixed a few skywars bugs
improved warning for bridges
2015-06-27 11:24:01 +10:00
fooify 4b634d1bc3 Fix slashes (this won't affect windows users, right?) 2015-06-26 10:14:37 -07:00
fooify 333c54cff9 Merge branch 'master' into foo 2015-06-26 10:07:13 -07:00
Shaun Bennett 8ef52ea103 Mineplex Gold Rush 2.0 2015-06-26 10:50:37 -05:00
Cheese 9a0ac821a2 fixed stat bug 2015-06-26 19:44:13 +10:00
Cheese c0bc522614 split achievement text over 2 lines 2015-06-26 19:32:18 +10:00
Cheese 750769d03a fixed gem thing 2015-06-26 19:12:34 +10:00
Cheese 62a7fd6a99 you now get levels for kills/assists
fixed scoreboard bug
2015-06-26 19:12:11 +10:00
Cheese b0019242e7 skywars scoreboard fix 2015-06-26 19:02:34 +10:00
Jonathan Williams 8c427bee24 Fix _gameDisplay bug.
Fix Skywars quickmenu link.
2015-06-26 03:57:39 -05:00
Jonathan Williams 8f2c0cf9d8 Fix file names. 2015-06-26 03:15:16 -05:00
Jonathan Williams 62cfa215b2 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 03:12:09 -05:00
Jonathan Williams c1ef96bdcd Fixed jre for staff server 2015-06-26 03:12:00 -05:00
Shaun Bennett c158a6f89f Merge remote-tracking branch 'origin/master' 2015-06-26 03:10:53 -05:00
Shaun Bennett 3b6a692a2a Ooops 2015-06-26 03:10:44 -05:00
Cheese 1aa0832bb9 SkyWars to Skywars 2015-06-26 17:55:49 +10:00
Cheese 9bf58a2d98 disabled pistons 2015-06-26 17:47:04 +10:00
Cheese 1564a8bc51 disabled hoppers 2015-06-26 17:46:05 +10:00
Cheese 17af562f19 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 17:36:25 +10:00
Cheese 59f730ae9d changed sky text and icon to feather 2015-06-26 17:36:12 +10:00
Jonathan Williams f906f08a18 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:34:36 -05:00
Shaun Bennett 2657ef336a Merge remote-tracking branch 'origin/master' 2015-06-26 02:33:00 -05:00
Shaun Bennett 60901cc17e Merge remote-tracking branch 'origin/master'
Conflicts:
	Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
2015-06-26 02:32:51 -05:00
Cheese c31d3609bb soup no longer spawns in stacks 2015-06-26 17:32:46 +10:00
Shaun Bennett 7c698f65cf Quick Menu, and Stats adjustments for SkyWars. Updated Private server page to show game icon instead of player heads 2015-06-26 02:31:35 -05:00
Jonathan Williams c78ef9d93d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 02:30:01 -05:00
Cheese a5aa2bc0e9 text changes 2015-06-26 17:28:23 +10:00
Cheese 2498f7756c skyawrs stats icon 2015-06-26 17:16:16 +10:00
Cheese c514cacd5d more skywars fixes 2015-06-26 17:05:29 +10:00
Cheese 015ba53bbe skywars hub text 2015-06-26 16:39:25 +10:00
Cheese 027efe02fc skywars! 2015-06-26 16:38:44 +10:00
Jonathan Williams efa06d370b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 01:13:42 -05:00
Jonathan Williams 86e2514e37 Fixed callbacks for gem/coin rewards. 2015-06-26 01:13:28 -05:00
Cheese 257c088948 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-06-26 16:08:17 +10:00
Cheese b744320ecc pearl trail fix 2015-06-26 16:08:04 +10:00
Cheese caa51d0e89 Merge branch 'SkyWars' 2015-06-26 16:04:46 +10:00
Cheese 16af8453e3 pearl fix 2015-06-26 16:04:07 +10:00
Cheese 338797f4a6 skywars update 2015-06-26 15:57:47 +10:00
Cheese aef8a00017 update! 2015-06-26 15:25:43 +10:00
Cheese 8f3d0ad84b fixed some bugs :O 2015-06-26 14:38:39 +10:00
Cheese 0874178973 skywars update! 2015-06-26 14:14:22 +10:00
Cheese 2d1d65b239 skywars fixes 2015-06-26 13:15:03 +10:00
fooify 7f7edddf42 Fix TNT bug in SG - tested, works fine! :) 2015-06-25 19:36:31 -07:00