AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
829 Commits 26 Branches 15 Tags 52 MiB
Commit Graph

535 Commits

Author SHA1 Message Date
Jack Andersen b8010759fb Update boo 2016-06-30 09:31:00 -10:00
Jack Andersen 0913dfa61b Update athena and boo 2016-06-27 12:55:29 -10:00
Jack Andersen e90de8c5b0 Update boo 2016-06-22 11:44:59 -10:00
Jack Andersen f3f8d9406e Update boo 2016-06-20 21:09:31 -10:00
Jack Andersen 7335a528f0 CoInitializeEx usage tweak 2016-06-17 10:44:49 -10:00
Jack Andersen db092f39cd Update boo 2016-06-16 20:02:47 -10:00
Jack Andersen a1f628a76f Update boo 2016-06-15 17:29:33 -10:00
Jack Andersen fde3801972 Update boo 2016-06-14 18:01:24 -10:00
Jack Andersen 1b423acffa Update boo 2016-06-08 15:52:16 -10:00
Jack Andersen 2260116640 Update boo 2016-06-07 19:21:03 -10:00
Jack Andersen d1c52eb5d1 Update boo 2016-06-07 18:38:00 -10:00
Jack Andersen e798ebdd1a Update boo 2016-05-31 18:54:48 -10:00
Jack Andersen 334b9bd57a Update boo 2016-05-31 17:04:20 -10:00
Jack Andersen 45f4838487 Update boo 2016-05-31 12:00:01 -10:00
Jack Andersen cecaf91b19 Update boo 2016-05-31 00:18:32 -10:00
Jack Andersen 811e657e14 Update boo 2016-05-30 19:17:32 -10:00
Jack Andersen 4eee382669 Update boo 2016-05-27 21:16:34 -10:00
Jack Andersen 2a09c13d60 Update boo 2016-05-27 20:56:46 -10:00
Jack Andersen 0d8a58b85f Update boo 2016-05-24 16:03:27 -10:00
Jack Andersen 536af2ae9f Update athena and boo 2016-05-22 13:10:50 -10:00
Jack Andersen 825dfd8d7d Update boo 2016-05-21 22:37:44 -10:00
Jack Andersen 75ae95b8be Update boo 2016-05-21 12:44:05 -10:00
Jack Andersen 76a2d6b888 Update boo 2016-05-21 12:18:44 -10:00
Jack Andersen d98103ca9a Update boo 2016-05-21 11:46:19 -10:00
Phillip 78287126cf Update boo 2016-05-20 20:23:16 -07:00
Jack Andersen b2d1f6a7e8 Update boo 2016-05-20 15:16:51 -10:00
Jack Andersen 992b5fac63 Update boo 2016-05-20 12:57:51 -10:00
Jack Andersen 9ef95507ce Update boo 2016-05-19 20:16:47 -10:00
Jack Andersen 096ce6fbc3 Update boo 2016-05-19 00:14:47 -10:00
Jack Andersen 7e7475e4c3 Update boo 2016-05-18 16:19:29 -10:00
Jack Andersen e92f458090 Update boo 2016-05-16 17:46:35 -10:00
Jack Andersen 0203a11ee2 Update boo 2016-05-16 12:14:28 -10:00
Jack Andersen e988f7d45b Update boo 2016-05-16 10:21:39 -10:00
Jack Andersen 25c4b42ab6 Update boo 2016-05-15 16:41:54 -10:00
Jack Andersen 909c772284 Update boo 2016-05-15 11:56:05 -10:00
Jack Andersen a4ef7f3339 Update boo 2016-05-14 12:39:44 -10:00
Jack Andersen 1000c1ff89 Update boo 2016-05-13 18:48:15 -10:00
Jack Andersen 6dabea0b21 Update boo 2016-05-11 11:30:25 -10:00
Jack Andersen 78923d2e95 Update boo 2016-05-10 18:50:43 -10:00
Jack Andersen c66234715d Update boo 2016-05-09 16:30:28 -10:00
Jack Andersen 89079e0f16 Update boo 2016-05-07 12:12:03 -10:00
Jack Andersen dbebf1de08 Update boo 2016-05-06 18:29:37 -10:00
Jack Andersen e50cf6d0ec Update boo 2016-04-15 10:58:35 -10:00
Jack Andersen 88276db37f ClientProcess fix 2016-04-15 10:42:19 -10:00
Jack Andersen 761be432be Updates for new ANIM extract 2016-04-06 17:38:37 -10:00
Jack Andersen 2efb75d375 Update boo 2016-04-04 16:38:12 -10:00
Jack Andersen 52597cd731 Update boo 2016-04-04 16:26:20 -10:00
Jack Andersen 41dbd30970 Aux info functionality for ProjectPath 2016-04-04 15:49:42 -10:00
Jack Andersen 635193c2fe HLSL backend update 2016-04-04 09:34:22 -10:00
Jack Andersen 35b202dfb3 Update boo 2016-04-03 20:36:57 -10:00
Jack Andersen 6abde07598 Metal extension shaders 2016-04-03 20:15:07 -10:00
Jack Andersen 80284ad816 Update GLSL backend for proper block bindings 2016-04-03 19:00:40 -10:00
Jack Andersen 9681a26988 Update athena 2016-04-03 16:32:18 -10:00
Jack Andersen 4388cf64e5 Update GLSL backend for memory testing 2016-04-03 16:27:16 -10:00
Jack Andersen 5563ff403e Update boo 2016-04-02 20:22:19 -10:00
Jack Andersen 54ca41f2ed Update boo and Metal backend 2016-04-02 20:19:03 -10:00
Jack Andersen 1cf85d7ddd Update boo 2016-04-02 19:21:06 -10:00
Jack Andersen 8534af8b4d Windows fixes 2016-04-02 17:31:50 -10:00
Jack Andersen 500589dbd3 Update boo 2016-04-01 18:41:09 -10:00
Jack Andersen fa7207d6b3 Update boo 2016-04-01 18:25:15 -10:00
Jack Andersen ec27174c6f Update boo 2016-04-01 17:55:54 -10:00
Jack Andersen 831ad0af8e Add primitive type to shader tag 2016-04-01 17:34:03 -10:00
Jack Andersen a0b0cec67d Update boo 2016-04-01 14:04:10 -10:00
Jack Andersen 9d72601f9a LambdaTransaction added to ClientProcess 2016-03-31 18:24:28 -10:00
Jack Andersen 8e6ec6ecac Update athena 2016-03-30 20:17:43 -10:00
Jack Andersen 6c0285bdda Update boo 2016-03-30 11:08:00 -10:00
Jack Andersen f254b34cca boo lambda D3D sync 2016-03-30 10:43:09 -10:00
Jack Andersen 72fc1e5754 boo lambda-factory API refactor 2016-03-30 09:15:08 -10:00
Jack Andersen 3822f001a8 ClientProcess updates 2016-03-28 11:38:31 -10:00
Jack Andersen bbf8639a6a Initial ClientProcess class, require Blender 2.77 2016-03-27 10:41:29 -10:00
Phillip Stephens 4931b9811a Update athena 2016-03-25 19:23:04 -07:00
Jack Andersen 4f3d1de117 Update boo 2016-03-25 14:50:59 -10:00
Jack Andersen 3015372883 D3D sync 2016-03-23 22:35:04 -10:00
Jack Andersen bb0ca46194 Vulkan sync 2016-03-23 22:15:55 -10:00
Jack Andersen a09d042a3d Update shader pipeline calls 2016-03-23 22:06:24 -10:00
Jack Andersen d35408376c Add '-y' flag for hecl 2016-03-23 16:51:57 -10:00
Jack Andersen 51d4caf252 Update boo 2016-03-23 14:04:33 -10:00
Phillip Stephens 879cbc3fe1 Update athena 2016-03-19 21:09:30 -07:00
Phillip Stephens 91b705206d Update boo 2016-03-17 14:05:21 -07:00
Jack Andersen e70ed33281 Update boo 2016-03-14 13:32:18 -10:00
Jack Andersen e9a787aa25 Update boo 2016-03-08 11:19:25 -10:00
Jack Andersen dfde882573 Update boo 2016-03-08 10:29:38 -10:00
Jack Andersen 6e245c4355 Update boo 2016-03-07 21:10:39 -10:00
Jack Andersen 26486a19ba Update boo 2016-03-07 12:48:19 -10:00
Jack Andersen 1d2a5ae66e Update boo 2016-03-06 17:12:05 -10:00
Jack Andersen 50fb283afc Update LICENSE date 2016-03-06 17:10:13 -10:00
Jack Andersen ae81e66aa6 Add libjpeg-turbo submodule 2016-03-05 15:19:32 -10:00
Jack Andersen cdd40a14df Update boo 2016-03-04 17:33:11 -10:00
Jack Andersen 31fa668e78 Humungous refactor 2016-03-04 13:02:44 -10:00
Jack Andersen 2a7ae959fa Update boo 2016-03-04 09:20:34 -10:00
Jack Andersen d4209770cd Submodule refactor 2016-03-04 09:18:59 -10:00
Jack Andersen 5e67ec3ff4 Update Athena 2016-03-03 15:01:20 -10:00
Jack Andersen a67dbc96db Update Athena 2016-03-01 15:49:01 -10:00
Jack Andersen 6b3dbf1b87 Update Athena 2016-03-01 10:29:07 -10:00
Jack Andersen e6aeff08a3 Link removal (complexity not worth it) 2016-02-29 17:05:42 -10:00
Jack Andersen b2a2cd3934 Update boo 2016-02-26 16:03:55 -10:00
Jack Andersen f4f843acee Update boo 2016-02-26 15:38:54 -10:00
Jack Andersen f01a8d26d3 Update boo 2016-02-26 10:18:29 -10:00
Jack Andersen ffd2ad7d0a Update boo 2016-02-25 22:02:59 -10:00
Jack Andersen 2bc89cd6a6 Update boo 2016-02-25 19:35:54 -10:00
Jack Andersen 1bf683d975 Update boo 2016-02-25 14:12:19 -10:00
Jack Andersen 9a35417f42 Update boo 2016-02-24 10:52:53 -10:00
Jack Andersen c424e37fba Update boo and GLSL macros 2016-02-23 17:18:19 -10:00
Jack Andersen d76fcf0f5b Vulkan Updates 2016-02-22 16:33:29 -10:00
Jack Andersen f1cb3bdb58 Update boo 2016-02-18 10:52:36 -10:00
Phillip Stephens b430c28529 Update libBoo 2016-02-18 06:40:39 -08:00
Jack Andersen 52d840a49b Windows string fixes 2016-02-16 17:36:06 -10:00
Jack Andersen 474224a1d2 Update boo 2016-02-16 09:42:00 -10:00
Jack Andersen 195c58cd8b ProjectPath DirectoryEnumerator integration 2016-02-15 19:48:57 -10:00
Jack Andersen c5689c7366 Update Athena 2016-02-03 14:55:13 -10:00
Jack Andersen c9be1c079a Update submodules 2016-02-02 13:41:32 -10:00
Jack Andersen e9eb0b52b4 Update Athena 2016-02-01 18:29:35 -10:00
Phillip Stephens 8a2af29f39 Update Boo 2016-01-31 00:38:22 -08:00
Jack Andersen bee8d1eab5 Update boo 2016-01-29 15:41:35 -10:00
Jack Andersen dd5ba8fcec Update boo 2016-01-28 15:17:52 -10:00
Jack Andersen 5f275b4dd9 Update boo 2016-01-28 13:54:50 -10:00
Jack Andersen 45ad13faa4 Update boo 2016-01-27 17:39:38 -10:00
Jack Andersen d86c46ec8a Update boo 2016-01-27 13:26:32 -10:00
Jack Andersen c16832239f Update boo 2016-01-27 09:27:23 -10:00
Jack Andersen 3c0ae75aa2 Update boo 2016-01-22 17:38:51 -10:00
Jack Andersen a2a4a4e830 Update boo 2016-01-19 10:31:43 -10:00
Jack Andersen dff735895b Update boo 2016-01-18 13:33:11 -10:00
Jack Andersen baee6704dc Update boo 2016-01-17 14:36:23 -10:00
Jack Andersen 33a49c9097 Update boo 2016-01-16 18:13:57 -10:00
Jack Andersen 07c7f29a1f Update boo 2016-01-15 20:11:45 -10:00
Jack Andersen dab9295676 Update boo 2016-01-15 18:19:56 -10:00
Jack Andersen 0e29ef5cac Update boo 2016-01-15 13:35:06 -10:00
Jack Andersen 0bcdc6c77a Update boo 2016-01-14 17:35:59 -10:00
Jack Andersen 8590ae9f01 SPIR-V ShaderCache backend 2016-01-14 12:47:31 -10:00
Jack Andersen 99ea94de39 Integrate glslang AST compilation 2016-01-14 11:12:29 -10:00
Jack Andersen fa1937872d Update boo 2016-01-11 14:46:14 -10:00
Jack Andersen b9ca38e813 Update boo 2016-01-10 15:46:13 -10:00
Jack Andersen 9cb5855041 Update boo 2016-01-09 20:42:43 -10:00
Jack Andersen 34ab71a5a7 Update Athena 2016-01-08 16:01:03 -10:00
Jack Andersen cd6ae55c07 Use std::multimap to sort files by size 2016-01-07 14:05:50 -10:00
Jack Andersen 5f582ac597 Update boo 2016-01-06 14:38:59 -10:00
Jack Andersen 50f09bd20e Add ProjectPath::getPathComponents() 2016-01-06 11:03:41 -10:00
Jack Andersen 68d0e5202a Community Concensus MIT LICENSE revert 2016-01-05 09:15:54 -10:00
Phillip Stephens 74aebf106f Update libBoo 2016-01-04 18:45:41 -08:00
Jack Andersen e2c42b208c Add HECL::Rename 2016-01-04 14:00:34 -10:00
Jack Andersen 5c1551bf08 CVar initialization order fix 2016-01-03 19:25:00 -10:00
Jack Andersen a2cf004785 Update boo 2016-01-02 18:05:57 -10:00
Jack Andersen 7d91a6408e Update boo 2016-01-02 13:11:11 -10:00
Jack Andersen 6ccded30f8 Update boo 2016-01-02 11:17:26 -10:00
Jack Andersen 0c8d49a80a Win32 DirectoryEnumerator fixes 2016-01-01 18:16:20 -10:00
Jack Andersen 29fd504475 Initial system location finder (unix only) 2016-01-01 16:27:17 -10:00
Jack Andersen 4ca3cb8081 DirectoryEnumerator sorting options 2015-12-31 14:16:20 -10:00
Jack Andersen d827502b08 Update boo 2015-12-31 10:21:18 -10:00
Jack Andersen 04aa6ba915 Add Win32 DirectoryEnumerator 2015-12-30 20:36:29 -10:00
Jack Andersen d0dc830564 Update Athena 2015-12-30 19:03:15 -10:00
Jack Andersen bc70777e07 Update boo 2015-12-30 18:54:42 -10:00
Jack Andersen abb727fdce Update boo 2015-12-27 14:23:58 -10:00
Jack Andersen f32535cfed Update boo 2015-12-27 14:02:52 -10:00
Jack Andersen b161c95e27 Update boo 2015-12-27 13:24:47 -10:00
Jack Andersen 7aa3777459 Update Athena 2015-12-27 12:39:06 -10:00
Jack Andersen 689d7d400d Update boo 2015-12-27 12:38:19 -10:00
Jack Andersen 74fa576fb4 Update boo 2015-12-24 15:09:35 -10:00
Jack Andersen 68accbb0e9 Update boo 2015-12-24 10:57:24 -10:00
Jack Andersen 4f6b070709 Update boo 2015-12-23 17:31:35 -10:00
Jack Andersen 92de0f8db8 Update boo 2015-12-22 20:12:03 -10:00
Jack Andersen 8650ded5a8 Update boo 2015-12-20 15:06:41 -10:00
Jack Andersen 53bfffce04 Update boo 2015-12-20 14:56:15 -10:00
Jack Andersen d7444e23d9 Update boo 2015-12-20 14:41:42 -10:00
Jack Andersen f835401c8d Update submodules 2015-12-20 12:53:40 -10:00
Jack Andersen b88ea0139c Update Athena 2015-12-20 11:42:04 -10:00
Jack Andersen f286f629a5 Update boo 2015-12-20 09:18:08 -10:00
Jack Andersen 0cb2c1a40e Update boo 2015-12-18 12:00:27 -10:00
Jack Andersen f3df7b55ef Update boo 2015-12-18 11:34:21 -10:00
Jack Andersen 895e013649 Update boo 2015-12-17 19:48:19 -10:00
Jack Andersen c1a4192b76 Update boo 2015-12-17 18:55:46 -10:00
Jack Andersen 5884622de1 Update boo 2015-12-17 17:25:53 -10:00
Jack Andersen dddc033319 Update submodules 2015-12-17 12:10:40 -10:00
Jack Andersen 4459f8b2ac Update boo 2015-12-17 11:30:34 -10:00
Jack Andersen 4240c79b58 Update boo 2015-12-14 09:21:07 -10:00
Jack Andersen 4ca4d2c36a Update boo 2015-12-13 18:55:38 -10:00
Jack Andersen 1a8c2cd11f Update boo 2015-12-09 12:23:49 -10:00
Jack Andersen 342aeec1b8 Update boo 2015-12-09 11:03:26 -10:00
Jack Andersen 302d9de25b Update boo 2015-12-08 19:53:57 -10:00
Jack Andersen e21517b98f Update boo 2015-12-08 19:23:53 -10:00
Jack Andersen 494d03f1e2 Update boo 2015-12-08 15:04:33 -10:00
Jack Andersen 52173af9fd Update boo 2015-12-08 13:58:08 -10:00
Jack Andersen 267e18d35b Update boo 2015-12-07 19:43:05 -10:00
Jack Andersen 4713cd226e Update boo 2015-12-07 15:49:40 -10:00
Jack Andersen fe38a026e8 Update Athena 2015-12-06 14:53:30 -10:00
Jack Andersen 356899a8fe Update boo 2015-12-05 15:26:33 -10:00
Jack Andersen 3b19ea50d9 Update boo 2015-12-04 14:42:21 -10:00
Jack Andersen 9d2978082f Update libBoo 2015-12-03 16:26:39 -10:00
Jack Andersen 8b8b109f9a Update boo 2015-12-03 15:55:53 -10:00
Jack Andersen e993d18fa8 Update boo 2015-12-03 15:34:29 -10:00
Jack Andersen e229de7393 Update libBoo 2015-12-02 12:26:03 -10:00
Jack Andersen b290254191 Update libBoo 2015-12-02 12:05:14 -10:00
Jack Andersen 47fb36def6 Moved CVars to HECL 2015-12-02 11:11:10 -10:00
Jack Andersen fff3100f17 OS X now using POSIX-style file store 2015-12-01 17:06:39 -10:00
Jack Andersen 103e2a04cc Update Athena 2015-12-01 15:39:13 -10:00
Jack Andersen add7ba1bdf Update submodules 2015-11-30 14:35:08 -10:00
Jack Andersen 69788ac273 Update boo 2015-11-29 17:41:29 -10:00
Jack Andersen 19cb8b9e32 Updated boo 2015-11-29 16:38:16 -10:00
Jack Andersen de232e76ce Update libBoo 2015-11-29 14:21:01 -10:00
Jack Andersen c2e9fe16c6 Update Athena 2015-11-28 11:44:57 -10:00
Jack Andersen 8bf39efcd8 Update boo 2015-11-27 18:08:28 -10:00
Jack Andersen 89077c3233 Update submodules 2015-11-27 12:17:09 -10:00
Jack Andersen d8d6a4d00a Updated libBoo 2015-11-26 13:03:37 -10:00
Jack Andersen 299084ada1 Updated libBoo 2015-11-25 21:33:45 -10:00
Jack Andersen f7e195a140 Updated libBoo 2015-11-25 14:22:55 -10:00
Jack Andersen 83a3c645ae Updated libBoo 2015-11-24 16:15:25 -10:00
Jack Andersen 9c844d8fd4 Updated boo 2015-11-22 22:50:22 -10:00
Jack Andersen a19bc6827c Athena error handling tweak 2015-11-22 17:09:46 -10:00
Jack Andersen a443b6df73 Restored system libpng 2015-11-22 13:50:11 -10:00
Jack Andersen 2c7df0b4de Merge branch 'master' of https://github.com/AxioDL/hecl 2015-11-22 13:49:33 -10:00
Jack Andersen ef8d3c32ab Updated libpng to 1.6.19 2015-11-22 13:48:47 -10:00
Phillip Stephens f1f2e9c924 Merge branch 'master' of https://github.com/AxioDL/hecl 2015-11-22 14:44:26 -08:00
Phillip Stephens c72b355c4c Temporary fix for libPNG 2015-11-22 14:43:59 -08:00
Jack Andersen c438479f2d Changed LICENSE terms 2015-11-22 10:28:04 -10:00
Phillip Stephens bdd8cf6d33 Update submodules 2015-11-21 20:21:34 -08:00
Jack Andersen c4f8743bf6 OS X enum refactor fixes 2015-11-20 16:16:54 -10:00
Jack Andersen 0a457d854a Major scoped-enum refactor 2015-11-20 15:13:06 -10:00
Jack Andersen daa446588b Metal shader generation 2015-11-18 13:56:45 -10:00
Jack Andersen 6387b420ae Working HECL shader generation on D3D11/12 2015-11-17 20:16:08 -10:00
Jack Andersen 05f3854449 Updated boo 2015-11-17 10:34:00 -10:00
Jack Andersen fc61ca3c61 Updated boo 2015-11-17 10:26:34 -10:00
Jack Andersen 6016f2d14b heclTest fixes 2015-11-16 20:42:42 -10:00
Jack Andersen 501f4724a3 Updated boo 2015-11-16 18:20:38 -10:00
Jack Andersen 0c731457fb Updated boo 2015-11-16 15:25:33 -10:00
Jack Andersen 6804a12641 Updated boo 2015-11-16 12:04:13 -10:00
Jack Andersen 8bce62290a Updated boo 2015-11-16 10:43:53 -10:00
Jack Andersen 6ae4f6ed11 Additions to test 2015-11-15 18:30:06 -10:00
Jack Andersen 77c5f8c089 Updated Athena, squelched some warnings 2015-11-14 13:59:38 -10:00
Jack Andersen a37a300be0 Merge branch 'master' of https://github.com/AxioDL/hecl 2015-11-14 13:41:06 -10:00
Jack Andersen ad1a47e8b4 HMDL outputting fixes 2015-11-14 13:40:32 -10:00
Phillip 013046ad65 Fix magics (needs proper fix) 
Implement windows profile directory retrieval
 2015-11-14 00:48:31 -08:00
Phillip 363090fddb Cache paths 2015-11-13 23:37:20 -08:00
Phillip 7606bf840f Remove LogVisor (it's in extern/libBoo anyway) 2015-11-13 22:49:09 -08:00
Phillip e0cff83a41 Squash MSVC warnings 2015-11-13 22:39:27 -08:00
Jack Andersen 7c0206bd39 Initial ShaderCache implementation 2015-11-12 16:12:09 -10:00
Jack Andersen a9fe41d994 Updated libBoo; added heclTest target 2015-11-11 18:32:53 -10:00
Jack Andersen b13c90c331 Submodule updates 2015-11-10 21:03:23 -10:00
Jack Andersen faccdbc55a backslash-escaping predicate 2015-11-10 18:01:36 -10:00
Jack Andersen b4725c7d2e libBoo update and windows fixes 2015-11-10 10:11:38 -10:00
Jack Andersen c0d89d3e1e Transplant of libBoo to hecl's extern 2015-11-09 16:06:27 -10:00
Jack Andersen 262d6a6f28 Updated LogVisor 2015-11-09 09:44:47 -10:00
Phillip Stephens dcd0515f04 Add "None" as a lightmap option 
Add Target testing for LogVisor
 2015-10-30 13:03:20 -07:00
Jack Andersen 9892d2176c Initial world blend type 2015-10-23 15:21:58 -10:00
Jack Andersen 87b86b7553 Much more optimal mesh optimizer 2015-10-20 15:33:54 -10:00
Phillip Stephens ed0a0fc686 Enable C++14 2015-10-19 18:13:45 -07:00
Jack Andersen 2044a4b9b1 Updated Athena 2015-10-17 18:17:30 -10:00
Jack Andersen 181c17bdd5 Updated Athena 2015-10-17 18:08:31 -10:00
Jack Andersen d5cc16b79a Updated Athena 2015-10-15 17:08:01 -10:00
Jack Andersen 2034a83576 Various updates and fixes 2015-10-15 14:34:47 -10:00
Jack Andersen 9a47c3dd6d OS X fixes 2015-10-11 19:19:04 -10:00
Jack Andersen 32bd32b9dd Initial HECL language frontend 2015-10-08 16:08:10 -10:00