Thanos paravantis
|
d4fd466029
|
Update local workspace with new Eclipse version.
|
2015-12-11 17:10:00 +02:00 |
|
Thanos paravantis
|
3f4980a90f
|
Merge branch 'master' into thanos-mineware
|
2015-12-11 13:32:24 +02:00 |
|
Thanos paravantis
|
0b56c01c2f
|
Commit before pulling from master.
|
2015-12-11 13:30:20 +02:00 |
|
Shaun Bennett
|
ac6d3c2c8f
|
merge with master
|
2015-12-11 06:27:23 -05:00 |
|
William Burns
|
523c1875ef
|
fix
|
2015-12-11 06:58:11 +00:00 |
|
Jonathan Williams
|
95a81ef368
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
# Conflicts:
# Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
|
2015-12-11 01:26:20 -05:00 |
|
Jonathan Williams
|
222173ab17
|
Improved and implemented GameProfile caching.
|
2015-12-11 01:24:59 -05:00 |
|
Jonathan Williams
|
b5c157c123
|
Changed PlayerCache to Cache
|
2015-12-11 01:24:16 -05:00 |
|
libraryaddict
|
9a4006df27
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-12-11 17:18:07 +13:00 |
|
libraryaddict
|
c5f0624bf7
|
Add build file
|
2015-12-11 17:17:52 +13:00 |
|
Shaun Bennett
|
4588091c5b
|
Merge remote-tracking branch 'origin/master'
|
2015-12-10 23:15:42 -05:00 |
|
Shaun Bennett
|
21c8a66917
|
Fix imports
|
2015-12-10 23:15:35 -05:00 |
|
libraryaddict
|
3cd187ff04
|
Move LineFormat.java
|
2015-12-11 16:57:21 +13:00 |
|
libraryaddict
|
4cfa7c436b
|
Add missing file
|
2015-12-11 16:48:40 +13:00 |
|
William Burns
|
a760dba783
|
i lied.
|
2015-12-11 02:59:16 +00:00 |
|
William Burns
|
7a597d90b7
|
final push goodnight
|
2015-12-11 02:48:06 +00:00 |
|
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 |
|
libraryaddict
|
a0b7870acc
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-12-11 15:21:18 +13:00 |
|
libraryaddict
|
1661c056c1
|
Added line stuff
|
2015-12-11 15:21:05 +13:00 |
|
Shaun Bennett
|
2694787590
|
Reverting
|
2015-12-10 20:59:57 -05:00 |
|
Shaun Bennett
|
cf73d27a84
|
Merge remote-tracking branch 'origin/master'
|
2015-12-10 20:53:42 -05:00 |
|
Shaun Bennett
|
4d05bd5c50
|
Player count for chiss
|
2015-12-10 20:53:38 -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 |
|
Shaun Bennett
|
ab16bf89e5
|
Merge remote-tracking branch 'origin/master'
|
2015-12-10 17:04:25 -05:00 |
|
Shaun Bennett
|
851b613d2e
|
Now playing fix
|
2015-12-10 17:04:15 -05: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 |
|
Thanos paravantis
|
e17669427e
|
Merge branch 'master' into thanos-mineware
Conflicts:
Plugins/Nautilus.Game.Arcade/.settings/org.eclipse.jdt.core.prefs
|
2015-12-10 10:03:41 +02:00 |
|
Thanos paravantis
|
e6125b74ef
|
Commit all changes before pulling from master.
|
2015-12-10 09:59:37 +02:00 |
|
libraryaddict
|
1ee1e7a04b
|
Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
|
2015-12-10 20:02:39 +13:00 |
|
libraryaddict
|
eaf3937004
|
Fix the damage while walking on falling block
|
2015-12-10 20:02:12 +13:00 |
|
Cheese
|
fabf3dab59
|
updated blocksearch
|
2015-12-10 13:12:01 +11: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 |
|