Commit Graph

2429 Commits

Author SHA1 Message Date
William Burns 1607345f04 title + debug 2015-12-11 02:41:44 +00:00
William Burns 563a0f0ec7 remove tutorial and no flicker 2015-12-11 02:30:44 +00:00
Shaun Bennett 2694787590 Reverting 2015-12-10 20:59:57 -05:00
William Burns f8d7aeb5ea before revert 2015-12-11 01:32:32 +00:00
William Burns dda5ac6728 work 2015-12-11 01:20:36 +00:00
William Burns 626a812844 Many changes 2015-12-11 00:40:54 +00:00
William Burns 4cf33eef05 Tutorial changes! 2015-12-10 21:32:14 +00:00
William Burns 624e8bbe89 Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-10 20:56:03 +00:00
William Burns 0bd276c16a Merge branch 'pregametutorial' of ssh://184.154.0.242:25565/min/mineplex into pregametutorial 2015-12-10 20:53:01 +00:00
William Burns 8d7b03e3f6 Added the ability to have title AND subtitle per TutorialText. 2015-12-10 20:52:41 +00:00
William Burns 2951088005 Tutorial changes/additions. 2015-12-10 20:48:13 +00:00
William Burns 3586642414 Added back the tutorial. 2015-12-10 19:32:25 +00:00
William Burns af7c058f22 Lots of bug fixes / additions since the testing 12/9/15. 2015-12-10 19:06:07 +00:00
William Burns 87a834c01b FIX 2015-12-10 00:03:57 +00:00
William Burns 90896073d4 debug 2015-12-10 00:03:17 +00:00
William Burns cea2716851 fight man 2015-12-09 23:59:20 +00:00
William Burns 05bd55f720 iter 2015-12-09 23:53:04 +00:00
William Burns b8a2304edd work 2015-12-09 23:39:00 +00:00
William Burns 3ad0a3db6e fix 2015-12-09 23:14:08 +00:00
William Burns 17c989d941 Less per-player arena stuff 2015-12-09 22:39:04 +00:00
William Burns 513db5dd8d doing byes 2015-12-09 21:33:31 +00:00
William Burns 852be97bae Work 2015-12-09 20:16:16 +00:00
Sarah a5c46545df fixing timer being shown. 2015-12-09 14:44:22 +01:00
William Burns c021fbf9ed Bounce baby bounce. 2015-12-08 23:27:38 +00:00
William Burns d709071feb Much fix, many wow. 2015-12-08 23:20:42 +00:00
William Burns a83ede3caa Handling slow movers 2015-12-08 21:14:19 +00:00
William Burns 7bdbd5a6af Woo almost done! 2015-12-08 21:10:27 +00:00
William Burns d598f83ec0 More progress 2015-12-08 18:17:43 +00:00
William Burns f8f95c64e5 Fixing arena moving 2015-12-08 15:10:29 +00:00
William Burns 4e2a422f27 Merge branch 'master' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators
# Conflicts:
#	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/PerkCowAngryHerd.java
2015-12-08 13:13:18 +00:00
William Burns 2b12016e14 Progress 2015-12-08 13:12:30 +00:00
Shaun Bennett addb2c8c0e Fix java 8 compiler issue 2015-12-08 08:02:40 -05:00
William Burns e6d995008e Arenas 2015-12-08 10:44:24 +00:00
William Burns 43192317ad Merge branches 'pregametutorial' and 'william-gladiators' of ssh://184.154.0.242:25565/min/mineplex into william-gladiators 2015-12-07 23:20:21 +00:00
William Burns 55f0453897 Start of re-write 2015-12-07 23:20:03 +00:00
Sarah 0619fb857f fixing invisibility. 2015-12-07 23:44:02 +01:00
Shaun Bennett 7984c0ac31 Add ! 2015-12-07 06:12:49 -05:00
Cheese a39b11ce67 slowed meteors 2015-12-07 21:56:00 +11:00
Cheese d318a5cf87 interacto! 2015-12-07 21:53:34 +11:00
Cheese e1efcabfbf chat sale msgs 2015-12-07 20:39:31 +11:00
Cheese 7b11baf24b Christmas sale bossbars 2015-12-07 20:20:49 +11:00
Cheese 8c4615203c sale message 2015-12-07 20:07:20 +11:00
Cheese ed3bea8e85 DONE! 2015-12-07 18:36:05 +11:00
Cheese 5c632a1e3a sharper target 2015-12-07 18:20:12 +11:00
Cheese 1a0d90a495 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2015-12-07 18:06:43 +11:00
Cheese fea637db80 fixed some freeze 2015-12-07 18:06:26 +11:00
Shaun Bennett ecde1dd314 Merge remote-tracking branch 'origin/master' 2015-12-07 02:06:09 -05:00
Shaun Bennett 44a5bcb793 remove titan chest message, update pumkin message, holiday MB/DMT words 2015-12-07 02:06:00 -05:00
Cheese d75d7a2c8f snowfight finish 2015-12-07 17:56:35 +11:00
Cheese 1ada06af91 rewrote lots! 2015-12-07 17:36:45 +11:00