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

2196 Commits

Author SHA1 Message Date
Lioncash eb872cdf88 hecl/hecl: Assign ResourceLock's good member in the initializer list 
Same behavior, but more idiomatic. While we're at it, we can make said
constructor and the conversion operator explicit to make the class a
little less error-prone.
 2019-08-15 02:26:12 -04:00
Lioncash 92b87676c2 hecl/hecl: Make Entry take SystemString by value and move it 
This allows callers to move into the constructor and subsequently move
into the member variable, avoiding copies altogether.
 2019-08-15 02:26:12 -04:00
Lioncash dae3e6123f hecl/hecl: Make string conv operator+ instances friend functions 
Makes both operators symmetrical to one another.
 2019-08-15 02:26:12 -04:00
Lioncash c7aae83a75 hecl/hecl: Slightly improve resource usage within string conv operator+ funcs 
We already construct a std::string instance, so we can just append to
it instead of creating another temporary with std::string's operator+.
We also change this to append using the string view getter functions, as
this allows the appending process to do less work. When a pointer is
passed in, a strlen call would need to be performed in order to
determine the total characters to append. However, we already know the
size (via the string view).
 2019-08-15 02:26:12 -04:00
Lioncash c513a4b61f hecl/hecl: Make use of std::char_traits with StrNCmp 
Same behavior, but allows removing the use of ifdefs, unifying the code
paths.
 2019-08-15 02:26:12 -04:00
Lioncash ef6b41ea15 hecl/hecl: Amend string functions operating on string views to use interface functions 
We don't really need to call out to the C functions to perform the
comparison behavior when the views already have a comparison function
as part of their interface.
 2019-08-15 02:26:03 -04:00
Lioncash e0b5a4e2f7 hecl/hecl: Cast to unsigned char before calling std::isspace 
std::string_view instances can contain character values that lie outside
the range of an unsigned char (negative values). If such a value is
passed into std::isspace, then the behavior of the function is
undefined. To avoid this, we add these casts.
 2019-08-15 01:21:10 -04:00
Lioncash 91ff474c44 hecl/hecl: Handle bounded strings within CaseInsensitiveCompare 
std::string_view instances aren't guaranteed to be null-terminated, so
we shouldn't be treating them as if they are in these functions, and
should instead use a bounded comparison based off their sizes.

This way we prevent an edge-case from ever becoming a problem and also
remove an ifdef, making the code uniform across all implementations.
 2019-08-15 01:21:04 -04:00
Phillip Stephens 9dc1373201 Update boo 2019-08-14 06:52:24 -07:00
Phillip Stephens 78e88679a9 Update boo 2019-08-13 14:40:21 -07:00
Phillip Stephens a7c97b313c Update athena 2019-08-10 17:47:40 -07:00
Jack Andersen 0ab08daae7 Windows build fixes 2019-07-27 15:21:31 -10:00
Jack Andersen 7b05b41d34 Windows build fixes 2019-07-27 15:19:48 -10:00
Jack Andersen 5acf9ecbcf Graphics debug groups and bug fixes 2019-07-20 22:42:52 -10:00
Jack Andersen 08d15514a9 Update submodules 2019-07-20 22:42:03 -10:00
Jack Andersen 7a3da1f7a6 Massive fmtlib refactor 2019-07-19 18:27:21 -10:00
Jack Andersen 6988f86672 Massive fmtlib refactor 2019-07-19 18:22:58 -10:00
Jack Andersen e38a3ece89 More CBabygoth fixes 2019-07-06 22:22:35 -10:00
Jack Andersen b483acb8d3 Update submodules 2019-07-06 22:21:39 -10:00
Phillip Stephens 97ae6fbe98 Fix codesign failure 2019-07-01 02:22:17 -07:00
Phillip Stephens efa7463a9a shaderc metal "error" fix 2019-07-01 01:26:42 -07:00
Phillip Stephens c30703209f Fix macOS builds finally 2019-06-30 21:04:24 -07:00
Phillip Stephens cfd365bebe Update boo 2019-06-30 21:03:54 -07:00
Phillip Stephens 46c570f8a6 Update submodules 2019-06-30 20:41:06 -07:00
Phillip Stephens b251de5fd0 Update boo 2019-06-30 20:40:26 -07:00
Phillip Stephens 975b275334 Update submodules 2019-06-30 20:17:13 -07:00
Phillip Stephens 385f60cea3 Update boo 2019-06-30 20:15:40 -07:00
Jack Andersen 77af3f0ebd CPuddleToadGamma and animation system fixes 2019-06-20 20:02:56 -10:00
Jack Andersen 3256a05a99 Update boo 2019-06-20 20:02:34 -10:00
Jack Andersen 9ccc4227cb Initial support for asynchronous shader compilation 2019-06-15 20:25:29 -10:00
Jack Andersen 49eb971037 Update boo 2019-06-15 20:25:03 -10:00
Jack Andersen 37307e1cf6 Various CActorContraption fixes 2019-06-14 14:39:20 -10:00
Jack Andersen 4fa1a2f3b7 Fixes for ANCS cooking 2019-06-14 14:37:53 -10:00
Jack Andersen 6679f6de72 Windows build fixes 2019-06-12 15:33:35 -10:00
Jack Andersen 31caec79dd Windows build fixes 2019-06-12 15:29:52 -10:00
Jack Andersen e218b8aeb5 CActorContraption fixes, better CMake dependency handling 2019-06-11 16:05:17 -10:00
Jack Andersen 387f8fa864 Blender Python API updates and better CMake dependency handling 2019-06-11 16:01:19 -10:00
Jack Andersen b7aa3e06d2 Per-stage shader hashing 2019-06-05 14:07:50 -10:00
Jack Andersen 7cc157c8b9 Support for per-stage shader hashing 2019-06-05 14:07:29 -10:00
Jack Andersen 5e60131062 Metal Cubemaps 2019-06-02 21:51:44 -10:00
Jack Andersen 82fc24ebe6 Update boo 2019-06-02 21:51:26 -10:00
Jack Andersen 4a4cf58b6f HLSL cubemaps 2019-05-31 23:28:12 -10:00
Jack Andersen 4de7e2c0d6 Update boo 2019-05-31 23:27:44 -10:00
Jack Andersen 410d7896f7 Support for rendering dynamic cubemaps 2019-05-31 17:41:01 -10:00
Jack Andersen c8c6936e0c Update boo 2019-05-31 17:40:30 -10:00
Jack Andersen bf3ac9e34b macOS build fixes 2019-05-10 13:08:58 -10:00
Jack Andersen 50ca5553ab Ensure ApplicationReps.hpp is generated in binary directory 2019-05-10 13:08:05 -10:00
Jack Andersen 4554fc06bc Update hecl 2019-05-09 18:10:16 -10:00
Jack Andersen e1b01a0962 Update boo 2019-05-09 18:10:04 -10:00
Jack Andersen 5f4ebcb2f5 Windows fixes 2019-05-09 18:09:01 -10:00
Jack Andersen f596cbff83 Windows fixes for refactor 2019-05-09 18:07:48 -10:00
Jack Andersen 80d334ec69 Skinned CMDL fix 2019-05-08 13:38:22 -10:00
Jack Andersen 92e2c03a01 Fix skin binding unordered_map use 2019-05-08 13:38:00 -10:00
Jack Andersen 233d13ceb9 Refactor for blender 2.8 and new shader model 2019-05-07 17:50:21 -10:00
Jack Andersen 5c59acddf2 Blender 2.8 refactor 2019-05-07 17:47:34 -10:00
Jack Andersen 3a0d2930fa Numerous uninitialized memory fixes 2019-04-06 19:14:48 -10:00
Jack Andersen 8b1b674a7d Ensure uninitialized data is not accessed in normal operation 2019-04-06 18:54:58 -10:00
Jack Andersen b72cc490e8 Implement CFishCloud 2019-04-02 18:32:31 -10:00
Jack Andersen 2ab5c1436b Add True and False tests for bitwise enums 2019-04-02 18:29:04 -10:00
Jack Andersen a63a61fef8 Implement CWallCrawlerSwarm 2019-03-23 22:06:59 -10:00
Jack Andersen 6816fea5b8 Update athena 2019-03-23 22:05:36 -10:00
Jack Andersen 52b36795ac Proper handling for persistently resident resources 2019-03-09 23:37:36 -10:00
Jack Andersen 4bb697cbdf Update boo 2019-03-09 23:14:04 -10:00
Jack Andersen f40bf707f6 DCLN OBB transform fix 2019-03-07 18:16:42 -10:00
Jack Andersen 72b14a78a0 Correct indirect texture sampling swizzle 2019-03-07 17:33:50 -10:00
Jack Andersen 4b042f6f9a OpenGL memory leak fix 2019-03-04 22:34:43 -10:00
Jack Andersen 3759bf1b3d Avoid redundant pool destroy/allocs 2019-03-04 22:34:03 -10:00
Jack Andersen 54f0724de5 D3D fixes 2019-03-03 13:04:18 -10:00
Jack Andersen f262e59e68 Update boo 2019-03-03 13:03:33 -10:00
Jack Andersen 8b9f073635 Various rendering fixes 2019-03-02 20:19:42 -10:00
Jack Andersen 927be4e839 Proper blending modes for handling alpha test 2019-03-02 20:17:41 -10:00
Jack Andersen c45d5db182 Update hecl 2019-02-26 19:14:22 -10:00
Jack Andersen 1f04f7ae12 Add closefrom call to RunProcess 2019-02-26 19:13:19 -10:00
Jack Andersen 4cb26976bd More thermal visor fixes; face reflection fix 2019-02-26 18:52:01 -10:00
Jack Andersen 6626557cc4 TexGen bug fix with diffuse-only pass 2019-02-26 18:50:13 -10:00
Jack Andersen 67b9882dbe Thermal visor fixes 2019-02-24 22:14:59 -10:00
Jack Andersen 8e8ecaf4aa Add fallback for diffuse expression 2019-02-24 22:10:34 -10:00
Jack Andersen d78e90f593 Update hecl 2019-02-24 00:15:19 -10:00
Jack Andersen a9254f6643 Ensure pipes aren't duplicated between blender instances 2019-02-24 00:14:44 -10:00
Jack Andersen 8df0a4913c zeus constexpr refactor and thermal visor fixes 2019-02-23 21:15:54 -10:00
Jack Andersen 470182de06 Support for diffuse texture identification in IR 2019-02-23 21:14:43 -10:00
Jack Andersen 48eaa2545b Working CScriptGunTurret 2019-02-17 19:47:46 -10:00
Jack Andersen d13bd28281 Update boo 2019-02-17 19:46:29 -10:00
Jack Andersen fc40190933 Implicit switch fallthrough refactor 2019-02-17 19:44:46 -10:00
Jack Andersen 6441bcc3a2 GCC build fix 2019-02-15 15:32:05 -10:00
Jack Andersen fdbfbf74fd Update athena 2019-02-15 15:31:21 -10:00
Jack Andersen e815c4d461 Update hecl 2019-02-11 21:19:17 -10:00
Jack Andersen f46cd474a6 Update boo 2019-02-11 21:19:02 -10:00
Jack Andersen 01af7b735d Implement CScriptSpindleCamera 2019-02-09 18:41:35 -10:00
Jack Andersen 3cc65704d3 Disable contiguous surface splitting 2019-02-09 18:41:13 -10:00
Jack Andersen 88591f48f0 More bug fixes 2019-02-07 21:56:54 -10:00
Jack Andersen b6af26fa91 addColor term for standard shader model 2019-02-07 21:55:39 -10:00
Jack Andersen 2b022c7d72 Better CMake configuration for Xcode 2019-02-03 15:38:35 -10:00
Jack Andersen d88c9cc21b Debug mode for metal shaders 2019-02-03 15:38:14 -10:00
Jack Andersen a353c7ddcf Metal shader fixes 2019-02-03 14:01:44 -10:00
Jack Andersen 23a6d66a8c Add -j argument for hecl cooking 2019-02-03 14:01:12 -10:00
Jack Andersen ad2681f857 Windows fixes 2019-01-28 22:28:35 -10:00
Jack Andersen f35285b076 Windows fixes 2019-01-28 22:25:51 -10:00
Phillip Stephens 4dd40f519e Fix CScriptGenerator infinite recursion, update submodules 2019-01-26 15:22:51 -08:00
Phillip Stephens 7542cb9650 Minor fixes 2019-01-26 15:21:30 -08:00
Jack Andersen aeb6a9a147 More mouse events for pause screen 2019-01-21 18:23:51 -10:00
Jack Andersen 8cbb1e650f Update boo 2019-01-21 18:23:42 -10:00
Jack Andersen 851e113dc0 Implement CWarWasp 2019-01-15 18:22:44 -10:00
Jack Andersen 0178e8b7d6 PATH generation fixes for blender addon 2019-01-15 18:22:30 -10:00
Jack Andersen 5b55320e9b Implement CPlasmaProjectile 2019-01-02 17:47:28 -10:00
Jack Andersen 6ff366f214 Update boo 2019-01-02 17:47:07 -10:00
Jack Andersen 147a9396c4 CBeetle implementation 2018-12-30 19:01:42 -10:00
Jack Andersen 96895c6150 Update submodules 2018-12-30 19:01:30 -10:00
Jack Andersen ef63509bb3 Update lzokay 2018-12-26 11:40:01 -10:00
Jack Andersen 1d95cf9221 Update lzokay 2018-12-26 11:39:49 -10:00
Jack Andersen e716d05cec Switch to lzokay library 2018-12-19 17:45:48 -10:00
Jack Andersen 206e54210c Switch to lzokay library 2018-12-19 17:44:40 -10:00
Jack Andersen b7f35e0528 CRelAngle fix 2018-12-16 17:52:51 -10:00
Jack Andersen 838afd73ae Update athena 2018-12-16 17:52:24 -10:00
Jack Andersen f184291461 ANCS PAS I/O fix 2018-12-15 20:32:07 -10:00
Jack Andersen 0af86ab3c2 Update submodules 2018-12-15 20:30:35 -10:00
Jack Andersen ec1cb75b25 Finish CSpacePirate implementation 2018-12-12 21:39:16 -10:00
Jack Andersen f695aa44d4 Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/hecl 2018-12-12 21:39:03 -10:00
Jack Andersen d8da828d12 Update athena 2018-12-12 21:38:40 -10:00
Phillip Stephens f776f89bee Minor Console fixes 2018-12-09 21:12:10 -08:00
Jack Andersen 14747e39e1 Windows fixes 2018-12-07 20:46:17 -10:00
Jack Andersen 7a68a5350b Update athena 2018-12-07 20:44:26 -10:00
Jack Andersen 636c82a568 New code style refactor 2018-12-07 19:30:43 -10:00
Jack Andersen 72193079ae New code style refactor 2018-12-07 19:18:42 -10:00
Jack Andersen 7c7da6671a SIMD refactor 2018-12-07 15:49:15 -10:00
Jack Andersen 54c466276b SIMD refactor 2018-12-07 15:31:11 -10:00
Jack Andersen 9c88971df6 Initial CSpacePirate and rag doll imps 2018-11-23 22:09:35 -10:00
Jack Andersen 1b073abb76 Change cheats CVar key 2018-11-23 22:08:44 -10:00
Phillip Stephens 89ece2e9b2 Proper CRandom16 usage 
More CScriptGunTurret imps
 2018-11-09 18:48:06 -08:00
Phillip Stephens 6695e9596d Fix heclTest build 2018-11-09 15:31:51 -08:00
Jack Andersen 1aab0528f3 Various bug fixes 2018-11-07 14:53:38 -10:00
Jack Andersen e2ec1f69a3 Vertex shaders do rigging computations in object space 2018-11-07 14:53:00 -10:00
Jack Andersen 3ef7386978 Proper interleaved rendering of indirect-textured particle instances 2018-11-04 21:25:28 -10:00
Jack Andersen e140b16af8 Update boo 2018-11-04 21:25:18 -10:00
Jack Andersen 98c7525176 Initially working CEnvFxManager 2018-11-01 22:16:16 -10:00
Jack Andersen b2586432c7 Proper CRLF-handling for #define 2018-11-01 14:32:28 -10:00
Jack Andersen 45fb8db388 Integrate SDNA parser for checking .blend types 2018-10-21 23:29:44 -10:00
Jack Andersen 344148e3b3 Add direct SDNA parser for blend files 2018-10-21 22:14:32 -10:00
Jack Andersen 8fb77eac2c Various bug fixes 2018-10-20 18:14:00 -10:00
Jack Andersen a230eeb3b1 Macros for shader extensions to determine blend factors 2018-10-20 18:13:25 -10:00
Jack Andersen 395e5c191b macOS build fixes 2018-10-18 16:44:41 -10:00
Jack Andersen 808e46a4ef Update boo 2018-10-18 16:19:17 -10:00
Jack Andersen 561bdac1c4 macOS build fixes 2018-10-18 14:57:16 -10:00
Jack Andersen 27ca93178a Upside-down OpenGL reflection fix 2018-10-18 13:55:59 -10:00
Jack Andersen 3698199403 Reflection sampler fixes 2018-10-18 13:55:42 -10:00
Jack Andersen 8d839d8a17 Scan visor and waterbox fix 2018-10-16 17:26:55 -10:00
Jack Andersen 2e824b6bb5 Update boo 2018-10-16 17:26:21 -10:00
Jack Andersen ad94f2d0f4 ApplicationReps.hpp fix 2018-10-16 15:01:50 -10:00
Jack Andersen ba6e920034 Generate ApplicationReps.hpp in binary directory 2018-10-16 15:01:33 -10:00
Jack Andersen 2eb4573e53 Remove FLIPFROMGL from shaders, use F1 key for uncapping frame-rate 2018-10-15 21:28:41 -10:00
Jack Andersen 46a6fc67ed Update submodules 2018-10-15 21:26:26 -10:00
Jack Andersen 919140c06f macOS API sync 2018-10-15 17:17:02 -10:00
Jack Andersen d395f4a79e macOS build fixes 2018-10-15 17:15:05 -10:00
Jack Andersen 1851308021 Windows fixes 2018-10-14 10:16:21 -10:00
Jack Andersen 61a50aa57e Windows sync fixes for API changes 2018-10-14 10:09:15 -10:00
Jack Andersen 1559163f98 Shader refactor bug fixes and attachment model extract/cook 2018-10-11 10:50:05 -10:00
Jack Andersen aef455e1ab Attachment model support in blender addon 2018-10-11 10:48:13 -10:00
Jack Andersen c91e5df986 Convert to pragma once 2018-10-06 17:42:33 -10:00
Jack Andersen d1f0450401 Convert to pragma once 2018-10-06 17:38:44 -10:00
Jack Andersen c307e354ca Huge shader refactor 2018-10-06 16:59:17 -10:00
Jack Andersen 0c3dece31d Update logvisor 2018-10-06 16:57:55 -10:00
Jack Andersen 0ee18025dd Huge shader infrastructure refactor 2018-10-06 16:53:57 -10:00
Jack Andersen 9a9ea9128e Update submodules 2018-09-08 11:35:00 -10:00
Jack Andersen 170ff23843 Ensure bintoc creates output directory 2018-09-08 11:34:37 -10:00
Jack Andersen ee4ce29884 Update submodules 2018-09-03 14:15:29 -10:00
Jack Andersen 31e3ee4d34 Update boo 2018-09-03 14:15:16 -10:00
Jack Andersen 56eeada360 Windows fixes 2018-09-02 20:34:09 -10:00
Jack Andersen 808f227b8d Update boo 2018-09-02 20:33:02 -10:00
Jack Andersen e46ec80b64 Integrate Amuse into hecl cook/extract for MP1/2 2018-09-02 14:46:16 -10:00
Jack Andersen e16ef9709d Update submodules 2018-09-02 14:45:32 -10:00
Jack Andersen 5a60a0acfc Amuse API changes 2018-08-27 19:44:16 -10:00
Jack Andersen be1184f822 Update boo 2018-08-27 19:42:14 -10:00
Jack Andersen ddc415b668 Update submodules 2018-08-27 17:47:39 -10:00
Jack Andersen a53748aff8 Update submodules 2018-08-25 21:57:25 -10:00
Jack Andersen 7ab391ccee Update submodules 2018-08-24 22:38:48 -10:00
Jack Andersen 4da4b76434 Update submodules 2018-08-19 10:07:47 -10:00
Jack Andersen 9a0934482e Update boo 2018-08-18 14:28:34 -10:00
Jack Andersen 0d64508ad4 Update submodules 2018-08-18 12:16:53 -10:00
Jack Andersen e41680d467 Update athena 2018-08-09 20:19:07 -10:00
Jack Andersen 66fa8bbf9b Update submodules 2018-07-27 18:33:24 -10:00
Phillip Stephens 34fdcd0a56 Update submodules 2018-07-15 10:13:38 -07:00
Jack Andersen 680cb7b353 Finish CInterpolationCamera 2018-06-27 15:17:01 -10:00
Jack Andersen 5b5e8212c3 Update boo 2018-06-27 15:15:57 -10:00
Jack Andersen 079c343557 ANIM cook fix; OBB generation crash fix 2018-06-15 16:26:58 -10:00
Jack Andersen 3f45710fb2 Fix cook tool crash 2018-06-15 16:26:30 -10:00
Phillip Stephens 4d8cf17078 Better handling for logging CVar 2018-06-12 20:20:49 -07:00
Phillip Stephens 61f744e15d Defer values for unregistered CVars 2018-06-12 20:19:08 -07:00
Phillip Stephens f6719cbec1 Initial implementations to support world teleportation via console, Add CVar for logging script messages 2018-06-12 19:08:11 -07:00
Phillip Stephens 801214d9a8 Add support for string literals in Console::executeString, add implicit get/set for CVars 2018-06-12 19:03:29 -07:00
Jack Andersen 1e36329ed4 Implement Metal fluid plane tessellation shader 2018-06-11 15:16:27 -10:00
Jack Andersen eff677ca20 Update boo 2018-06-11 15:16:00 -10:00
Jack Andersen 8f9d7da3ee Implement tessellation shader for HLSL 2018-06-07 15:15:46 -10:00
Jack Andersen 11f6617c2f Update boo 2018-06-07 14:43:18 -10:00
Jack Andersen ac424ff9eb Implement CFluidPlaneGPU for GPU-computed water ripples 2018-06-06 18:43:26 -10:00
Jack Andersen 03cb7cf237 Ensure lighting extension is passed vec3 2018-06-06 18:36:46 -10:00
Jack Andersen 357a7efa9a Various bug fixes 2018-06-01 20:06:40 -10:00
Jack Andersen cded4dfe1d Update boo 2018-06-01 20:06:10 -10:00
Jack Andersen 56a5cfd115 Fix TSan-reported race conditions 2018-06-01 14:03:31 -10:00
Jack Andersen 56a0661d33 Update boo 2018-06-01 14:02:20 -10:00
Jack Andersen 4062b2dfb7 Add AMD GCN hang fix; add frame counter to debug overlay 2018-05-31 20:38:01 -10:00
Jack Andersen 4c974c5275 Update boo 2018-05-31 20:37:40 -10:00
Jack Andersen 1e5b6f0fb5 Windows fullscreen fix 2018-05-28 17:41:28 -10:00
Jack Andersen b50f0d8c10 Update boo 2018-05-28 17:41:13 -10:00
Jack Andersen 65fd883a99 Windows fixes 2018-05-28 10:27:41 -10:00
Jack Andersen 37ff06314e Windows fixes 2018-05-28 10:24:16 -10:00
Jack Andersen 7e45600bed Major Vulkan performance improvement 2018-05-27 11:35:58 -10:00
Jack Andersen 13e6bf0274 Update boo 2018-05-27 11:35:49 -10:00
Jack Andersen 5eea7f3d70 Fix Vulkan multisampling 2018-05-26 19:14:30 -10:00
Jack Andersen 1689902af3 Update boo 2018-05-26 19:14:06 -10:00
Jack Andersen cc6d79e280 Various bug fixes 2018-05-26 18:22:38 -10:00
Jack Andersen ae1c4ce890 Update boo 2018-05-26 18:20:27 -10:00
Jack Andersen 92ed463051 synchronize macOS with latest changes 2018-05-26 11:30:19 -10:00
Jack Andersen c6b979f38e Update boo 2018-05-26 11:29:54 -10:00
Jack Andersen f2dda765af Fix GEqual depth test 2018-05-25 17:42:20 -10:00
Jack Andersen 5bfa33c21f Update boo 2018-05-25 17:42:03 -10:00
Jack Andersen 0d3a67e78f Fix area token loading 2018-05-25 17:07:29 -10:00
Jack Andersen c11557bcff Make SIGINT a bit cleaner for packaging 2018-05-25 17:07:04 -10:00
Jack Andersen a37fb861e1 Use glslang from upstream remote 2018-05-25 12:17:31 -10:00
Jack Andersen ec58e5b35f Use glslang from upstream remote 2018-05-25 12:17:22 -10:00
Jack Andersen 23c38e7e86 Update submodules 2018-05-25 12:03:16 -10:00
Jack Andersen e77d62ab15 Update submodules 2018-05-25 12:02:52 -10:00
Jack Andersen 70b3404b7c Windows build fixes and warning avoidance 2018-05-24 20:39:38 -10:00
Jack Andersen 77f814192e Windows build fixes 2018-05-24 20:34:58 -10:00
Jack Andersen 1ada86cc03 Vulkan fixes 2018-05-21 21:51:08 -10:00
Jack Andersen 85bab33ae3 Update boo 2018-05-21 21:48:44 -10:00
Jack Andersen 536f943858 Vulkan backend fixes 2018-05-20 12:38:56 -10:00
Jack Andersen 6cadafa764 Update boo 2018-05-20 12:38:06 -10:00
Phillip Stephens f4bd59bb2f Disable CPatterned branches in CScriptActorKeyframe for now, update submodules 2018-05-20 08:38:44 -07:00
Phillip Stephens 6ac9a1de8a Update boo 2018-05-20 08:37:48 -07:00
Phillip Stephens c5bcd88851 Fix compiling of heclTest 2018-05-20 08:31:59 -07:00
Jack Andersen f60af632b3 Big fixes and big memory leak refactor (linux only for now) 2018-05-19 20:14:57 -10:00
Jack Andersen d0d330062f Resource tracing and memory leak fixes 2018-05-19 20:12:32 -10:00
Jack Andersen 979a54a8a8 More bug fixes 2018-05-17 18:16:33 -10:00
Jack Andersen 33d9ce1638 Update boo 2018-05-17 18:16:18 -10:00
Jack Andersen 10d36ac1d6 Fix actor physics move 2018-05-14 16:56:05 -10:00
Jack Andersen 69c08292d2 Update boo 2018-05-14 16:55:50 -10:00
Jack Andersen 41034fefda Fix see though collision material 2018-05-10 21:02:42 -10:00
Jack Andersen 9c30a44a65 Fix see through collision material 2018-05-10 21:02:19 -10:00
Jack Andersen 12430610f1 Lots of bug fixes 2018-05-09 21:25:26 -10:00
Jack Andersen fef55d7fc0 Update boo 2018-05-09 21:25:09 -10:00
Jack Andersen f4f2278615 Add sanitizers to executable targets 2018-05-06 13:09:39 -10:00
Jack Andersen b866ab0509 Add sanitizers to executable targets 2018-05-06 13:08:52 -10:00
Jack Andersen ab398bd937 Update submodules 2018-05-06 12:47:38 -10:00
Jack Andersen 7c69b0f465 Update boo 2018-05-06 12:45:44 -10:00
Jack Andersen cc28dc7f0d Linux cook fixes 2018-05-05 15:32:53 -10:00
Jack Andersen f2d9f1328f Update boo 2018-05-05 15:32:36 -10:00
Jack Andersen 421e8d71eb Update boo 2018-05-05 15:29:57 -10:00
Jack Andersen 70657efa82 Various space-saving cook optimizations and fixes 2018-05-05 10:56:42 -10:00
Jack Andersen 01994c82e3 Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/hecl 2018-05-05 10:56:27 -10:00
Jack Andersen fda615f47e Cook meshes with primitive restart indices 2018-05-05 10:55:59 -10:00
Phillip Stephens 0aac384e60 Fix windows build 2018-05-01 17:41:51 -07:00
Phillip Stephens eae0dbd2bb Add ability to flag commands 2018-04-29 20:11:37 -07:00
Phillip Stephens 031c139e2d Merge commit '13b41ab' 2018-04-26 14:11:49 -07:00
Phillip Stephens 694bc0a888 Add ability to unregister command on the fly 2018-04-26 14:10:32 -07:00
Jack Andersen aa84d7c725 Add emissive cycles shaders 2018-04-14 20:04:08 -10:00
Jack Andersen 54d2759ace Lightmap UV fixes 2018-04-08 14:09:30 -10:00
Jack Andersen 2c5a662fec Add adjacent area lightmap cooking 2018-04-08 14:08:33 -10:00
Jack Andersen ed4d7445c7 More fixes for GameCube cooking 2018-04-07 10:55:57 -10:00
Jack Andersen 396790181a Minimized shader hash generation; more compatible MultiProgressPrinter 2018-04-07 10:52:35 -10:00
Jack Andersen d5e471bac3 Several GameCube cooking fixes 2018-04-03 22:31:29 -10:00
Jack Andersen 1eaa57bba2 Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/hecl 2018-04-03 22:28:31 -10:00
Jack Andersen b54dedb22b Minor cook fixes 2018-04-03 22:28:13 -10:00
Jack Andersen ecaf7f313f Update submodules 2018-04-02 15:06:21 -10:00
Jack Andersen e32b86f14e Update athena 2018-04-02 14:43:19 -10:00
Jack Andersen 06d755cf4c GameCube spec cook fixes 2018-04-01 18:27:24 -10:00
Jack Andersen 94988eb9e5 GX shader cook fixes; Resource cook passes 2018-04-01 18:26:21 -10:00
Jack Andersen 7a2fbfc582 Initial work on GameCube package targeting 2018-03-27 22:09:41 -10:00
Jack Andersen c9f61eb9da Fixes for GameCube targeting 2018-03-27 22:06:34 -10:00
Jack Andersen 7c0bf75f7a Various windows fixes and additions 2018-03-23 11:56:17 -10:00
Jack Andersen d1a66e15d4 Add parallel progress printing 2018-03-23 11:40:12 -10:00
Jack Andersen 08569104c2 Projectile collision fix 2018-03-14 14:27:45 -10:00
Jack Andersen 6180ec82b3 Fix lightmap script 2018-03-06 17:25:20 -10:00
Jack Andersen 48c285be11 FONT serialization fix; implement CPathFindSpline functions 2018-03-03 18:25:57 -10:00
Jack Andersen 905386d5e2 Update athena 2018-03-03 18:24:42 -10:00
Phillip Stephens 0c95ee6665 Update submodules, fix Linux build 2018-02-27 17:46:14 -08:00
Phillip Stephens d40f9ffe30 Update athena 2018-02-27 17:43:34 -08:00
Jack Andersen c15c5f47ed Windows build fixes 2018-02-26 20:03:35 -10:00
Jack Andersen d83f557f38 Update athena 2018-02-26 20:03:04 -10:00
Jack Andersen 72f9e77f56 Cooking bug fixes 2018-02-26 00:39:12 -10:00
Jack Andersen f2d6f643c9 PATH cooking bug fix 2018-02-26 00:38:50 -10:00
Jack Andersen 619a784434 Initial PATH cooking support 2018-02-24 22:23:27 -10:00
Jack Andersen 3acb9c9e3d Initial PATH cooking support 2018-02-24 22:23:00 -10:00
Jack Andersen 13e6ff31c6 Remove PATH material dump 2018-02-23 20:33:20 -10:00
Jack Andersen 2f6d9d2509 Minor macro adjustment 2018-02-23 20:33:01 -10:00
Jack Andersen 96662eb47c Initial PATH extraction support 2018-02-23 20:17:17 -10:00
Jack Andersen 06797cd9fc Add PATH .blend file type 2018-02-23 20:15:12 -10:00
Jack Andersen e4ff23c279 Massive template-based DNA refactor 2018-02-21 21:24:51 -10:00
Jack Andersen 3eedbd3c3b Template-based DNA refactor 2018-02-21 21:23:15 -10:00
Jack Andersen 8ab75b2c8f Implement asynchonous memory card for Win32 2018-02-06 15:38:46 -10:00
Jack Andersen d5f2e4a349 Update boo 2018-02-06 15:38:03 -10:00
Jack Andersen a547f1cd90 Update submodules 2018-02-04 21:04:58 -10:00
Jack Andersen 1685f03cf3 Update boo 2018-02-04 21:04:14 -10:00
Jack Andersen ac8dfde174 Various bug fixes and CActor rendering 2018-02-04 20:56:09 -10:00
Jack Andersen 7a60440d58 Add shader mode for constant alpha overwrite 2018-02-04 20:54:35 -10:00
Jack Andersen 15e5b4bbb8 NESEmulator save fixes 2018-02-02 14:35:19 -10:00
Jack Andersen ae076c5a32 Update boo 2018-02-02 14:34:15 -10:00
Jack Andersen 93fc2d8072 Initial fixNES integration 2018-02-01 13:19:34 -10:00
Jack Andersen ca48078600 Update boo 2018-02-01 13:13:08 -10:00
Jack Andersen c84845c9a5 Fix subtract blend 2018-01-29 21:49:56 -10:00
Jack Andersen 85a9e156b3 Update boo 2018-01-29 21:49:38 -10:00
Jack Andersen 13a31be23b Implement rumble classes 2018-01-25 23:48:42 -10:00
Jack Andersen 91926306f7 Update boo 2018-01-25 23:48:27 -10:00
Jack Andersen 132f2ab007 Update submodules 2018-01-22 18:41:30 -10:00
Jack Andersen 1b861eaa61 Non-clobbering YAML serialize operation 2018-01-22 18:40:09 -10:00
Jack Andersen 341876359a Update submodules 2018-01-21 21:34:44 -10:00
Jack Andersen 4988ba4294 Update boo 2018-01-21 21:34:15 -10:00
Phillip Stephens 2004c97480 Restore old CVar system 2018-01-21 18:45:41 -08:00
Phillip Stephens 2f840e5321 Merge commit 'f47d7d9' 2018-01-21 18:41:17 -08:00
Phillip Stephens 24abe43865 Restore old CVar system 2018-01-21 18:40:11 -08:00
Jack Andersen 6b22dfd3b5 Update boo 2018-01-21 13:30:22 -10:00
Jack Andersen a20b055bc1 Update boo 2018-01-21 13:08:22 -10:00
Jack Andersen f546400cc1 Update boo 2018-01-21 12:03:48 -10:00
Jack Andersen 669b3d6942 CWorldShadow OpenGL fixes; discord-rpc integration 2018-01-15 20:42:28 -10:00
Jack Andersen d3e1829994 heclTest fix 2018-01-15 20:41:33 -10:00
Jack Andersen ac29a724ba Deep color CVar and GLSL backend bug fixes 2018-01-15 20:30:37 -10:00
Phillip Stephens 030e80d843 Initial Console integration 2018-01-15 08:00:20 -08:00
Phillip Stephens da5ba6cdf3 Registration fix for Vec*CVar and StringCVar 2018-01-15 07:58:40 -08:00
Phillip Stephens 7c699172cc Update hecl and hecl-gui 2018-01-15 05:18:38 -08:00
Phillip Stephens 8cef2f5192 Add ability to enable developer mode in-code 2018-01-15 05:18:03 -08:00
Phillip Stephens 9255f0eeb0 Update hecl, various fixes 2018-01-15 04:36:04 -08:00
Phillip Stephens 5c66ffc5df Refactor CVar class 2018-01-15 04:34:02 -08:00
Phillip Stephens 867e080ab5 Update hecl 2018-01-13 23:42:48 -08:00
Phillip Stephens 4543e2a87e Merge commit 'c46f861' 2018-01-13 23:38:17 -08:00
Phillip Stephens 52c14848d9 Various minor fixes 2018-01-13 23:37:00 -08:00
Jack Andersen 7a179eb10a Various bug fixes 2018-01-13 20:44:22 -10:00
Jack Andersen 7a815e2962 Add missing <sstream> include 2018-01-13 20:40:42 -10:00
Jack Andersen 590fdb7a29 Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/hecl 2018-01-13 20:38:15 -10:00
Jack Andersen 96be9aa75b Update boo 2018-01-13 20:38:08 -10:00
Phillip Stephens f777d034f2 Implement core Console behavior and CVarManager commands 2018-01-13 18:39:32 -08:00
Jack Andersen 6e3dd7cabc Windows compile fix 2018-01-11 16:31:25 -10:00
Jack Andersen e683fc223f Metal non-MSAA fixes 2018-01-11 15:34:16 -10:00
Jack Andersen f92caf3810 Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/hecl 2018-01-11 15:32:41 -10:00
Jack Andersen 8491cdab77 Update boo 2018-01-11 15:31:25 -10:00
Phillip Stephens 55c1b5d56f Update hecl 2018-01-11 08:27:48 -08:00
Phillip Stephens 7f6913e046 Fix linux build, initial logvisor integration into Console 2018-01-11 08:26:33 -08:00
Phillip Stephens c86e6e941f Fix windows build 2018-01-11 04:38:53 -08:00
Phillip Stephens 24ee3fa21e Windows build fix 2018-01-11 04:38:35 -08:00
Phillip Stephens a9aa8d4a70 Initial `Console` implementation 2018-01-11 01:38:08 -08:00
Phillip Stephens e247733d04 Initial `Console` implementation 2018-01-11 01:36:00 -08:00
Jack Andersen d1f1a0d295 Update submodules for macOS fixes 2018-01-09 21:11:33 -10:00
Jack Andersen 70c97c1c2a Update boo 2018-01-09 21:10:38 -10:00
Jack Andersen 2de9eec12e Update boo 2018-01-09 20:26:39 -10:00
Jack Andersen 8f589cf928 Update boo 2018-01-09 20:26:17 -10:00
Jack Andersen 613d57299e Update submodules 2018-01-09 20:20:34 -10:00
Jack Andersen 2d0f079991 Add CVarCommons; hecl-light library 2018-01-09 20:16:18 -10:00
Phillip Stephens c38c998a51 Build fixes 2018-01-07 01:29:01 -08:00
Phillip Stephens 9b23877654 Update boo 2018-01-07 01:26:40 -08:00
Jack Andersen 4e5c991424 Metal API adjustments; MSAA support 2018-01-06 19:19:49 -10:00
Jack Andersen b3ca5b1e1e Changes to support MSAA rendering 2018-01-06 19:17:45 -10:00
Jack Andersen 168fab6b14 HUD rendering bug fixes 2018-01-05 20:50:42 -10:00
Jack Andersen 61f6c6fc73 Update boo 2018-01-05 20:50:27 -10:00
Jack Andersen a78c4c6b36 Animation transitions and pause screen fixes 2018-01-04 17:02:30 -10:00
Jack Andersen fe729a9000 Update boo 2018-01-04 17:01:17 -10:00
Jack Andersen 99fc9e3598 Various bug fixes and CAnimTree implementations 2018-01-03 18:17:44 -10:00
Jack Andersen eb1803aa0f Implement -o flag for extracting 2018-01-03 13:52:23 -10:00
Jack Andersen 49718630e2 Update copyright date 2018-01-02 14:25:48 -10:00
Jack Andersen f57e086e57 Update copyright date 2018-01-02 14:23:18 -10:00
Jack Andersen 1d5d970839 Update boo 2018-01-01 19:09:57 -10:00
Jack Andersen 8db5f1d8e1 Update boo 2018-01-01 19:09:40 -10:00
Jack Andersen ed6e6d134d Linux fixes 2018-01-01 18:24:01 -10:00
Jack Andersen 51e87e804a Update athena 2018-01-01 18:20:40 -10:00
Jack Andersen a1c5677413 Changes to support hecl-gui 2018-01-01 15:04:23 -10:00
Jack Andersen ab5d3ac996 Add HECL_DLPACKAGE macro 2018-01-01 14:58:13 -10:00
Jack Andersen b5c79d0e75 Add .gitlab-ci.yml 2018-01-01 00:17:36 -10:00
Jack Andersen 308af03115 Disable cotire unity build 2017-12-31 16:53:17 -10:00
Jack Andersen ca49e9a830 Update boo 2017-12-30 16:58:14 -10:00
Jack Andersen aec45ad2bb Windows PCH fixes 2017-12-29 15:09:45 -10:00
Jack Andersen 9daa74e08e Windows PCH fixes 2017-12-29 15:07:15 -10:00
Jack Andersen 8301adc3d6 Huge compile performance refactor 2017-12-28 22:08:12 -10:00
Jack Andersen aae0dc56b7 Huge compile performance refactor 2017-12-28 21:56:31 -10:00
Jack Andersen 2a341847d4 ANIM cook variable scope fix 2017-12-22 19:40:50 -10:00
Jack Andersen bc055b9126 Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/hecl 2017-12-22 19:39:48 -10:00
Jack Andersen 762a1ae7b9 Minor log removal 2017-12-22 19:39:03 -10:00
Phillip Stephens 2c63885435 Update boo 2017-12-21 18:17:20 -08:00
Jack Andersen c00cc6cea9 Lots of bug fixes; working CPhazonSuitFilter 2017-12-19 20:06:54 -10:00
Jack Andersen d82e1b89e3 Update boo 2017-12-19 20:04:59 -10:00
Jack Andersen 1c44f8d1bc Various movement and HUD bug fixes 2017-12-18 17:05:50 -10:00
Jack Andersen aa4a9b1800 Update submodules 2017-12-18 17:05:28 -10:00
Phillip Stephens 1e05e950d0 Initial `genie` specter tool implementation 2017-12-15 18:16:46 -08:00
Phillip Stephens 0e4310903d Update boo; Add initial GUI mode support 2017-12-15 18:13:20 -08:00
Jack Andersen 6e7cf97bdc Update boo 2017-12-15 14:18:19 -10:00
Jack Andersen d633176483 Update boo 2017-12-15 13:36:38 -10:00
Jack Andersen ce6a3aa50c Bug fixes and ASan build submodule 2017-12-11 16:06:19 -10:00
Jack Andersen 758c602dc5 Add ASan build capability 2017-12-11 16:05:28 -10:00
Jack Andersen 8901ac2150 Various fixes 2017-12-09 19:30:01 -10:00
Jack Andersen 93711460f8 More flexible cull-mode options for shader extensions 2017-12-09 19:29:23 -10:00
Jack Andersen 5e03278eff Add triangle flip bit for collision geometry 2017-12-08 19:17:51 -10:00
Jack Andersen a60a02a31e Add flip flag for collision triangles 2017-12-08 19:15:26 -10:00
Jack Andersen 0c1d0b5ce3 UWP CMake fixes 2017-12-07 16:55:12 -10:00
Jack Andersen 0423e38676 Update boo 2017-12-07 16:53:11 -10:00
Jack Andersen 55cfb267c1 UWP fixes 2017-12-06 18:13:12 -10:00
Jack Andersen 79f0336588 UWP fixes 2017-12-06 18:09:27 -10:00
Jack Andersen 1cb36fc37a UWP support 2017-12-05 17:26:15 -10:00
Jack Andersen 559096feeb UWP support 2017-12-05 17:22:31 -10:00
Jack Andersen 397d3b690c Use boo::ObjToken for referencing voices 2017-12-03 17:21:35 -10:00
Jack Andersen 1dd26f6241 Update boo 2017-12-03 17:21:13 -10:00
Jack Andersen 2bb0a9687e Windows fix 2017-12-02 20:18:55 -10:00
Jack Andersen 188bbbe13a Update boo 2017-12-02 20:18:39 -10:00
Jack Andersen 92767f5147 Fixes for new boo assert 2017-12-02 20:13:04 -10:00
Jack Andersen 96f1617aa5 Update boo 2017-12-02 20:07:32 -10:00
Phillip Stephens 80fcd9d342 Update submodules 2017-12-02 20:01:54 -08:00
Phillip Stephens 5811ca6bf5 Update submodules 2017-12-02 20:01:16 -08:00
Phillip Stephens f07594bd23 Update athena 2017-12-02 19:30:30 -08:00
Phillip Stephens 07838e4dfa Update .gitmodules for athena 2017-12-02 19:29:48 -08:00
Phillip Stephens f6ad805943 Update submodules 2017-12-02 13:28:07 -08:00
Phillip Stephens 8696b70f80 Update .gitmodules 2017-12-02 13:26:24 -08:00
Jack Andersen 357b001cac Octree generation fixes 2017-12-01 19:50:05 -10:00
Jack Andersen d4ce1d4913 ProjectPath bug fixes 2017-12-01 19:49:45 -10:00
Jack Andersen 7951cb1ee0 Bug fixes 2017-11-28 00:06:40 -10:00
Jack Andersen c9f7d67318 Update boo 2017-11-28 00:06:24 -10:00
Jack Andersen 5ed7bd7c45 Update submodules 2017-11-27 17:39:12 -10:00
Jack Andersen 143095f7f4 Update boo 2017-11-27 17:38:35 -10:00
Jack Andersen 11d17d0fe5 Various bug fixes 2017-11-25 17:04:25 -10:00
Jack Andersen ee0f668205 Update athena 2017-11-25 17:03:56 -10:00
Jack Andersen 80f98e1218 Windows fixes 2017-11-24 16:50:24 -10:00
Jack Andersen 1987a6e3d3 Implement asprintf for Windows 2017-11-24 16:49:50 -10:00
Jack Andersen 00b02bb0f3 Add lighting uniform to GLSL door plane shader 2017-11-24 12:08:16 -10:00
Jack Andersen 698d6a846e Update boo 2017-11-24 12:07:52 -10:00
Jack Andersen 6854cb9df7 Various bug fixes 2017-11-23 22:23:28 -10:00
Jack Andersen 5817ef3baf Merge branch 'master' of https://github.com/AxioDL/hecl 2017-11-23 22:20:43 -10:00
Jack Andersen f5cfbc25b6 Minor indentation fix 2017-11-23 22:20:30 -10:00
Phillip Stephens 74bc75ca29 Update boo 2017-11-23 23:19:05 -08:00
Jack Andersen ef4a07e963 Frustum culling fix 2017-11-21 12:18:52 -10:00
Jack Andersen 6aecd05314 Update boo 2017-11-21 12:18:41 -10:00
Jack Andersen f579007dc1 Initial area rendering (needs frustum culling fixes) 2017-11-21 00:36:18 -10:00
Jack Andersen b382188a5c Remove debugging changes 2017-11-21 00:22:36 -10:00
Jack Andersen ddf7c983da Major refactor of hecl parser using @hackyourlife architecture 2017-11-20 23:33:28 -10:00
Jack Andersen cff5198e6b Major graphics resource performance improvement 2017-11-19 13:48:09 -10:00
Jack Andersen 3aae48d0bf Update boo 2017-11-19 13:45:30 -10:00
Jack Andersen 3522d757fc Add `-l` flag to enable logging 2017-11-18 21:10:54 -10:00
Jack Andersen a1e7bd7943 Update boo 2017-11-18 21:09:44 -10:00
Jack Andersen a2c79eb996 More CAutoMapper fixes 2017-11-17 17:35:37 -10:00
Jack Andersen b25db30c2a MAPA fixes 2017-11-17 17:34:11 -10:00
Jack Andersen d14763ca19 CPauseScreenBlur fixes 2017-11-16 22:57:40 -10:00
Jack Andersen e1d952dd88 Update boo 2017-11-16 22:56:34 -10:00
Jack Andersen 0edac28ed4 Various CAutoMapper fixes 2017-11-16 13:49:25 -10:00
Jack Andersen a7881b6096 Update boo 2017-11-16 13:48:58 -10:00
Jack Andersen a914e121ea Various AutoMapper render fixes 2017-11-15 22:05:10 -10:00
Jack Andersen 48562a3527 Another MAPA cooking fix 2017-11-15 22:04:42 -10:00
Jack Andersen baa6acd198 Vulkan AMD instancing shader fix 2017-11-14 21:26:09 -10:00
Jack Andersen a9eda137b8 Update boo` 2017-11-14 21:25:45 -10:00
Jack Andersen 2df95c01cf General resource handling bug fixes 2017-11-14 18:12:13 -10:00
Jack Andersen 95682798a6 Update submodules 2017-11-14 18:11:50 -10:00
Jack Andersen 8cef6ce5e0 Specify CMake 3.10 in readme 2017-11-13 19:35:42 -10:00
Jack Andersen da9b2041f1 Fix help printout iterator edge cases 2017-11-13 19:35:00 -10:00
Jack Andersen e18eef9b18 Require CMake 3.10 2017-11-13 18:54:47 -10:00
Jack Andersen 6a797097a4 Require CMake 3.10 2017-11-13 18:51:09 -10:00
Jack Andersen 6d049bdbb1 Windows fixes 2017-11-13 17:36:36 -10:00
Jack Andersen b41b21cb4b Windows fixes 2017-11-13 17:34:05 -10:00
Jack Andersen 550078f7cb Linux build fixes 2017-11-12 21:21:51 -10:00