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

1132 Commits

Author SHA1 Message Date
Jonathan Williams 081260757d Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 18:31:26 -07:00
Jonathan Williams 6fd889d8fc Added Player mapping. 
Removed joining full servers for ultra.
 2014-07-01 18:31:17 -07:00
Mini-Chiss 31772196a9 More scoreboard stuff (TDM) 
New Tug game
 2014-07-01 18:30:04 -07:00
Jonathan Williams b627e8fdf5 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 10:25:12 -07:00
Jonathan Williams 9fd3f14248 Added RankUpdate command. 
Fixed Lobby joinable issue with server monitor.
Changed server monitor to be fully dynamic for us.
 2014-07-01 10:23:22 -07:00
CoderTim 7ea818c0c8 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-07-01 02:20:45 -04:00
Mini-Chiss 7bc3966feb Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-30 16:13:15 -07:00
Mini-Chiss 8c461b3e1b Cooldown on Spec Compass 
Hub Forcefield Update
Scoreboard MINEPLEX refactor
 2014-06-30 16:12:42 -07:00
Jonathan Williams 8e8e66f8c1 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 20:25:09 -07:00
Jonathan Williams 0287cfb2f6 Refactored Punish a bit so punishments don't expire early or jack up based on server's time. 2014-06-27 20:24:44 -07:00
CoderTim ccb17d5ac3 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-27 19:33:34 -04:00
Peter Miller 60a6f22194 Added functionality for retrieving serverName from Bungee 2014-06-27 17:01:54 -04:00
Mini-Chiss f10b081473 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-26 18:38:28 -07:00
Mini-Chiss 3d12196b17 Merge 
UHC Public
Small refactor for player ranks in games.
Trimed scoreboard teams to 16 chars.
 2014-06-26 18:38:11 -07:00
Jonathan Williams 681dfc5f7c Added ability to copy in schematics from build server. 
Added in gametype checking on parse.
 2014-06-26 12:09:29 -07:00
Jonathan Williams 210264f25b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 20:53:39 -07:00
Jonathan Williams 57c52cb9c8 Improved MapParser to allow world loading/saving for immediate testing. 2014-06-25 20:53:28 -07:00
Peter Miller e25101cd59 Continued enhancements... 2014-06-25 20:28:27 -04:00
Jonathan Williams f6ad5c5549 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-25 12:07:49 -07:00
Jonathan Williams 4f3ffde892 Added timing/debugging code. 2014-06-25 12:06:24 -07:00
Peter Miller bb5aa8e0f3 Work on /server and /send commands with permissions (more permissions need to be implemented). 2014-06-24 22:34:17 -04:00
Mini-Chiss 46849745c4 Champions TDM Update 2014-06-23 16:20:50 -07:00
Jonathan Williams f2c82cbf95 Refactored TimeUtil and added totalling option. 2014-06-20 20:42:36 -07:00
Jonathan Williams 6cac04d399 Optimized create scoreboards. 2014-06-19 00:48:04 -07:00
Jonathan Williams 231ffd7234 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 17:21:47 -07:00
Jonathan Williams 93fbe70e9c Added more loggingggggg. 2014-06-15 17:21:40 -07:00
Chiss c386023a6f Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-16 10:18:30 +10:00
Chiss fd17c1b254 More staggered teleports on game end 
Logging teleports.
 2014-06-16 10:18:10 +10:00
Jonathan Williams 6515dd13a0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-15 16:25:40 -07:00
Jonathan Williams 0f7885d911 Added safety checks in ClientManager 
Added logging and teampreference swap fix in arcade.
 2014-06-15 16:25:32 -07:00
Chiss a756bb88a2 NPE log 2014-06-16 09:25:14 +10:00
Jonathan Williams 7ff3765ba4 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 22:11:14 -07:00
Chiss 9a79d0ede7 Fixed CME 
Gadget cost fix
MapParser fix
 2014-06-15 15:10:19 +10:00
Jonathan Williams 04236939d6 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-14 21:27:42 -07:00
Jonathan Williams 26e16e8eac Added button file. 2014-06-14 21:27:33 -07:00
Jonathan Williams 264248ecfa Added castle siege quick join menu button. 2014-06-14 21:27:21 -07:00
Chiss 1bfa24cc45 Fixed Fireworks crash bug & portal destroy bug; 
-Only livingentities bounce off portals
-Fireworks cannot be used near portals
 2014-06-15 12:35:09 +10:00
Chiss d5c96f95c0 Fixed bug that gave items while respawning. 2014-06-15 12:01:58 +10:00
Chiss bac071e084 Map Parser 2014-06-15 10:12:08 +10:00
Chiss 2170f743dd Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 
Conflicts:
	Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
 2014-06-13 08:42:57 +10:00
Chiss 7517c0cabc merge 2014-06-13 08:40:01 +10:00
Jonathan Williams 336c307732 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-12 08:03:02 -07:00
Jonathan Williams be8fea8ca9 Changed Chat API key. 
Fixed PreferenceManager not saving asynchronously.
 2014-06-12 08:02:47 -07:00
Peter Miller 01fbda81ba More suggested improvements; commented out getEntries method for now. 2014-06-11 02:35:44 -04:00
Chiss 0be4df4531 Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex 2014-06-11 12:14:45 +10:00
Chiss 6a1ffcd3b7 Fixed some gadget stuff 2014-06-11 12:14:21 +10:00
Peter Miller 7bdaaa8ae0 Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-10 16:09:48 -04:00
Peter Miller 63f082b424 Implementing suggested code style/locking changes and recommitting (JIRA-76) 2014-06-10 16:09:33 -04:00
Jonathan Williams d82396d59b Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex 2014-06-10 02:06:22 -05:00
Jonathan Williams 4fca244812 Made ItemGadgets Free. 
Removed queue dom shop.
 2014-06-10 02:00:53 -05:00