Commit Graph

1573 Commits

Author SHA1 Message Date
AlexTheCoder 58b48f2a5d Fix merge conflicts 2017-11-08 21:48:17 -08:00
Alexander Meech c0fe6430fa
Delete remaining incorrect file 2017-11-02 01:52:37 -04:00
Alexander Meech d6ffaf7e04
Delete incorrect duplicate file 2017-11-02 01:52:00 -04:00
AlexTheCoder ab45277b74 Fix supply drop files somehow being packaged incorrectly 2017-11-02 01:50:47 -04:00
Sam 153d5bdc63 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-02 10:52:12 +01:00
AlexTheCoder 285ca1e707 Finish patching issues surrounding supply drops 2017-10-02 01:03:02 -05:00
AlexTheCoder be3e893b55 Fix some remaining issues with supply drops 2017-10-02 01:02:52 -05:00
Sam 4a9689bd17 Merge remote-tracking branch 'refs/remotes/origin/develop' into update/hub-makeover 2017-10-01 14:41:38 +01:00
AlexTheCoder 4c4a3c029e More supply drop fixes, implement new clans items to CUST-1, and fix forum group id assigned to the cmod tag 2017-09-26 05:41:30 -04:00
AlexTheCoder 1cdd6c0316 Fix supply drops sometimes dropping beacons if players click too fast 2017-09-24 18:38:49 -04:00
AlexTheCoder 99faf8bdd9 S4 post-release changes 2017-09-23 23:20:38 -04:00
AlexTheCoder 22620bf159 Fix spawn locations for new map 2017-09-23 06:54:43 -04:00
AlexTheCoder e4da5e5592 Final tidying up 2017-09-23 06:11:03 -04:00
AlexTheCoder 1e2dce46ad Tidy up issues from merge 2017-09-23 04:50:02 -04:00
AlexTheCoder 333c632030 Finishing touches 2017-09-23 04:15:07 -04:00
AlexTheCoder 128e16cbcd Add missing safe log qualifications 2017-09-23 04:15:07 -04:00
AlexTheCoder 010b85d1c3 Fixed merge conflicts 2017-09-23 04:15:00 -04:00
AlexTheCoder de015c0943 Fix Capture Point duration and prevent Undead City chests from respawning 2017-09-23 04:10:37 -04:00
AlexTheCoder 2efe422519 Fixed merge conflicts 2017-09-23 04:10:33 -04:00
AlexTheCoder 73fac33554 Fixed merge conflicts 2017-09-23 04:09:03 -04:00
AlexTheCoder 4df88e0b8e Implement a pvp timer 2017-09-23 04:02:56 -04:00
AlexTheCoder e107c1e6cc Fix a gold setting issue, block certain versions, and implement a bunch more content! 2017-09-23 04:02:56 -04:00
AlexTheCoder badfa76166 Fixed merge conflicts 2017-09-23 04:02:49 -04:00
AlexTheCoder 3fab186c09 Implement supply drops 2017-09-23 04:01:31 -04:00
AlexTheCoder cc0d6fa5ec Restrict placement of saplings and string 2017-09-23 04:01:31 -04:00
AlexTheCoder 2156787ff4 Fixed merge conflicts 2017-09-23 04:01:22 -04:00
AlexTheCoder f13e9cdf61 Clans queue system 2017-09-23 03:58:46 -04:00
AlexTheCoder 0a5dae5857 Fixed merge conflicts 2017-09-23 03:58:40 -04:00
AlexTheCoder 250306302f More tweaks to durability system 2017-09-23 03:56:04 -04:00
AlexTheCoder 8fd19c4fd3 Fixed merge conflicts 2017-09-23 03:55:56 -04:00
AlexTheCoder 8d3c9fdf61 Improvements to do with legendaries 2017-09-23 03:48:11 -04:00
AlexTheCoder 6aea0abc16 Don't send slack alerts from testing 2017-09-23 03:47:10 -04:00
AlexTheCoder 19988a8951 Make panic mode alert appropriate slack teams/channels 2017-09-23 03:47:10 -04:00
AlexTheCoder d623b07187 Nerf scythe of the fallen lord drop rate and ability 2017-09-23 03:47:10 -04:00
AlexTheCoder 51cac3d61c Begin implementing an anti-alting and vpn system 2017-09-23 03:47:10 -04:00
AlexTheCoder a06d2f7212 Fixed merge conflicts 2017-09-23 03:47:05 -04:00
AlexTheCoder 9ad4cd0068 Fixed merge conflicts 2017-09-23 03:46:00 -04:00
AlexTheCoder 514aced5e0 Patch exploit allowing for merging of Champions Classes in Clans 2017-09-23 03:44:32 -04:00
AlexTheCoder 2a0c9d58af Fix incorrect ordering of mount stat values causing strength and jump to be swapped 2017-09-23 03:44:32 -04:00
AlexTheCoder cf38af5de6 Prevent Runed Pickaxe passive from remaining too long 2017-09-23 03:44:32 -04:00
AlexTheCoder 222dd64bd0 Fixed merge conflicts 2017-09-23 03:44:24 -04:00
AlexTheCoder f487d2f3af Prevent clans from spamming users with invites 2017-09-23 03:42:52 -04:00
AlexTheCoder bc7401196c Prevent mounts from spawning too close to enemy claims and patch mounts transferring to all servers rather than the server they were obtained on 2017-09-23 03:42:52 -04:00
AlexTheCoder 76e74efced Fixed merge conflicts 2017-09-23 03:42:45 -04:00
AlexTheCoder 0da2691a87 Create panic system to protect official content creators 2017-09-23 03:41:57 -04:00
AlexTheCoder 559c641adc Disable crafting of minecarts to patch minecart phasing 2017-09-23 03:41:57 -04:00
AlexTheCoder 567b501dfb Fixed merge conflicts 2017-09-23 03:41:43 -04:00
AlexTheCoder f05fb3d0e0 Fix cloaking conditions being stuck enabled after expiring naturally, fix fissure being able to duplicate blocks with physics (sand, gravel), fix Magnetic Maul pulling mounts allowing users to fly, prevent mount dismounting resulting in players going through walls, and improve visibility system 2017-09-23 03:40:38 -04:00
AlexTheCoder eecf960613 Fixed Merge Conflicts 2017-09-23 03:40:21 -04:00
Alexander Meech 05a7d8d93e Make permissions for /o inheritable 2017-09-01 14:03:47 -05:00