Lioncash
27a8274e3b
Runtime/Input/CFinalInput: Make comparison operators const
...
While we're at it, we can also provide an inequality operator for
logical symmetry.
2019-08-14 02:11:50 -04:00
Lioncash
e9e9de26b2
Runtime/Input/CFinalInput: Correct return value of AKey, ASpecialKey and AMouseButton
...
The other A-prefixed functions all return a float value, however these
are truncating float values to bool. We can amend this to prevent
potential compilation warnings.
2019-08-14 02:07:02 -04:00
Lioncash
09f917a9aa
Runtime/Weapon/CGameProjectile: Fix misnamed virtual function
...
This has a vaguely equivalent name to FluidFXThink (which has an
uppercase X). Given this function isn't explicitly called anywhere
directly, this is assumed to be a typo.
2019-08-14 02:00:09 -04:00
Phillip Stephens
7eb3bce499
Update submodules, more CMetroidBeta imps
2019-08-13 14:41:15 -07:00
Phillip Stephens
ebdcfb6b51
Initial CMetroidBeta imps
2019-08-11 08:14:52 -07:00
Phillip Stephens
a572100176
Add CRipper files
2019-08-10 20:02:54 -07:00
Phillip Stephens
ad5e395a51
Fixes for `override` modernization
2019-08-10 17:49:41 -07:00
Phillip Stephens
1e625e0995
Fix missed `override` declarations
2019-08-09 15:07:52 -07:00
Phillip Stephens
1d3e5cdb70
Implement Oculus loader
2019-08-09 14:55:59 -07:00
Lioncash
9312eef905
RuntimeCommon: Use override where applicable
...
Continues the override modernization by applying it to the main
RuntimeCommon target. Resolves around 1100+ cases where override can be
used.
2019-08-09 17:39:42 -04:00
Phillip Stephens
5eaa7a23e8
Merge branch 'override' of https://github.com/lioncash/urde
2019-08-09 06:27:54 -07:00
Phillip Stephens
8089566788
Merge branch 'assign' of https://github.com/lioncash/urde
2019-08-09 06:27:05 -07:00
Lioncash
2059535b55
RuntimeCommonB: Use the override specifier where applicable
...
Applies the override keyword where applicable to indicate visually where
member function overriding is occurring. This only targets
the RuntimeCommonB target as a starting point, which resolves around
900+ cases where the keyword could be used.
2019-08-09 09:13:26 -04:00
Lioncash
af8731f2d2
GuiSys/CInstruction: Correct erroneous assignment in TestLargestFont
...
Without this, x20_largestMonoW will never be any value other than zero,
which is indicative of a logic bug.
2019-08-09 07:08:04 -04:00
Phillip Stephens
2f65d6d3a2
Merge branch 'namespace' of https://github.com/lioncash/urde into lioncache-namespace
2019-08-08 20:33:05 -07:00
Lioncash
fc906eec66
MP1/CMFGame: Remove erroneous forward declaration
...
This type is actually defined within the urde::MP1 namespace, not the
top-level urde namespace.
We remove the namespace itself however, given the header for that type
is already being included.
2019-08-08 23:10:00 -04:00
Phillip Stephens
d648f156b8
Revert original dolphin hash idea completely
2019-08-03 17:05:40 -07:00
Phillip Stephens
ff83dbc676
Minor fixes and cleanup
2019-08-03 17:02:53 -07:00
Jack Andersen
0ab08daae7
Windows build fixes
2019-07-27 15:21:31 -10:00
Jack Andersen
5acf9ecbcf
Graphics debug groups and bug fixes
2019-07-20 22:42:52 -10:00
Jack Andersen
b4fe474de3
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-07-19 18:29:06 -10:00
Jack Andersen
7a3da1f7a6
Massive fmtlib refactor
2019-07-19 18:27:21 -10:00
Phillip Stephens
1a9ca77603
Update ScriptObject DNAs to match known values
2019-07-19 01:30:11 -07:00
Phillip Stephens
cdf9545de4
Fix MemoryRelay handling in DataSpec
2019-07-16 19:10:57 -07:00
Phillip Stephens
e552030d40
Fix approach PathFind call
2019-07-16 15:33:18 -07:00
Phillip Stephens
18d6372c28
Finish CTryclops patterned functions
2019-07-16 15:28:14 -07:00
Phillip Stephens
328749d1ba
More CFlaahgra imps, initial CTryclops imps
2019-07-16 08:54:07 -07:00
Jack Andersen
e38a3ece89
More CBabygoth fixes
2019-07-06 22:22:35 -10:00
Jack Andersen
fd0bfc3acf
Minor flamethrower and babygoth fixes
2019-06-30 20:14:42 -10:00
Jack Andersen
003146f614
Work on CBabygoth
2019-06-29 21:29:49 -10:00
Phillip Stephens
44cae7bdb9
More CFlaahgra imps
2019-06-26 18:06:03 -07:00
Jack Andersen
a1745cff96
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-06-20 20:03:26 -10:00
Jack Andersen
77af3f0ebd
CPuddleToadGamma and animation system fixes
2019-06-20 20:02:56 -10:00
Phillip Stephens
eb43e9bdee
Silly compile fixes
2019-06-20 14:27:50 -07:00
Phillip Stephens
a67ea52617
More CFlaahgraImps
2019-06-20 14:22:06 -07:00
Phillip Stephens
6df0fcde50
Minor CElementGen cleanup, implement CFlaahgraPlants
2019-06-20 14:17:03 -07:00
Phillip Stephens
8c35cd02f0
More CFlaahgra imps
2019-06-19 14:11:13 -07:00
Phillip Stephens
568e15a89a
More Flaahgra imps
2019-06-18 18:55:38 -07:00
Phillip Stephens
6ae550e9d6
More CFlaahgra imps
2019-06-17 18:39:56 -07:00
Jack Andersen
9ccc4227cb
Initial support for asynchronous shader compilation
2019-06-15 20:25:29 -10:00
Jack Andersen
87023b432e
Fixes in ANIM cooking
2019-06-15 16:22:23 -10:00
Jack Andersen
37307e1cf6
Various CActorContraption fixes
2019-06-14 14:39:20 -10:00
Jack Andersen
bfa5b218f0
Remove unneeded debug messages
2019-06-11 16:20:15 -10:00
Jack Andersen
8266f52cc2
rstl::optional is no more
2019-06-11 16:14:39 -10:00
Jack Andersen
0e8e3e906c
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-06-11 16:05:44 -10:00
Jack Andersen
e218b8aeb5
CActorContraption fixes, better CMake dependency handling
2019-06-11 16:05:17 -10:00
Phillip Stephens
2f2ab149d4
Initial `CScriptSpecialFunction::ThinkSpinnerController`
2019-06-10 20:09:38 -07:00
Phillip Stephens
b7b65b04a4
Initial Flaahgra implementations
2019-06-10 01:28:33 -07:00
Phillip Stephens
0322b5b234
CFlaahgraTentacle doesn't actually create a shadow
2019-06-09 17:13:19 -07:00
Phillip Stephens
b251bc541f
CFlaahgraTentacle implementations (needs testing)
2019-06-09 17:09:07 -07:00
Jack Andersen
77d0ef942d
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-06-05 14:08:24 -10:00
Jack Andersen
b7aa3e06d2
Per-stage shader hashing
2019-06-05 14:07:50 -10:00
Jack Andersen
4a4cf58b6f
HLSL cubemaps
2019-05-31 23:28:12 -10:00
Jack Andersen
410d7896f7
Support for rendering dynamic cubemaps
2019-05-31 17:41:01 -10:00
Phillip Stephens
b18576cf58
Initial CMagdolite imps
2019-05-14 15:30:15 -07:00
Jack Andersen
486c925a45
Merge branch 'shader-refactor'
2019-05-10 13:10:12 -10:00
Jack Andersen
5f4ebcb2f5
Windows fixes
2019-05-09 18:09:01 -10:00
Phillip Stephens
c3527e1688
Fix compile issues
2019-05-09 20:15:26 -07:00
Phillip Stephens
81f1e22fc2
More CFlameThrower imps, implement `CScriptSpecialFunction::ThinkChaffTarget` and `CScriptSpecialFunction::ObjectFollowObject`
2019-05-09 19:33:56 -07:00
Jack Andersen
233d13ceb9
Refactor for blender 2.8 and new shader model
2019-05-07 17:50:21 -10:00
Phillip Stephens
28071851ad
Initial CFlameThrower imps
2019-04-16 01:00:46 -07:00
Jack Andersen
3a0d2930fa
Numerous uninitialized memory fixes
2019-04-06 19:14:48 -10:00
Jack Andersen
b72cc490e8
Implement CFishCloud
2019-04-02 18:32:31 -10:00
Jack Andersen
8e2db0795b
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-03-23 22:07:22 -10:00
Jack Andersen
a63a61fef8
Implement CWallCrawlerSwarm
2019-03-23 22:06:59 -10:00
Phillip Stephens
799ff4a64b
Finalize CBloodFlower imps
2019-03-23 22:45:47 -07:00
Phillip Stephens
d3a251589c
Revert convenience macro in ScriptLoader
2019-03-23 18:54:46 -07:00
Phillip Stephens
27643313f9
Implement CBloodFlower and more CBabygoth imps
2019-03-22 17:36:10 -07:00
Jack Andersen
99b1a8ef49
Lots of bug fixes
2019-03-12 17:46:20 -10:00
Jack Andersen
52b36795ac
Proper handling for persistently resident resources
2019-03-09 23:37:36 -10:00
Jack Andersen
2f963b9ce3
Various bug fixes
2019-03-08 22:58:27 -10:00
Jack Andersen
f40bf707f6
DCLN OBB transform fix
2019-03-07 18:16:42 -10:00
Jack Andersen
4b042f6f9a
OpenGL memory leak fix
2019-03-04 22:34:43 -10:00
Jack Andersen
ed4ebf0af1
Metal fixes
2019-03-03 18:45:22 -10:00
Jack Andersen
54f0724de5
D3D fixes
2019-03-03 13:04:18 -10:00
Jack Andersen
8b9f073635
Various rendering fixes
2019-03-02 20:19:42 -10:00
Jack Andersen
4cb26976bd
More thermal visor fixes; face reflection fix
2019-02-26 18:52:01 -10:00
Jack Andersen
67b9882dbe
Thermal visor fixes
2019-02-24 22:14:59 -10:00
Phillip Stephens
5ebf465a53
Minor fixes in CGameState and CScriptEffect
2019-02-24 15:04:10 -08:00
Jack Andersen
1b31a8fbc3
Windows fixes
2019-02-23 22:42:33 -10:00
Jack Andersen
8df0a4913c
zeus constexpr refactor and thermal visor fixes
2019-02-23 21:15:54 -10:00
Jack Andersen
1186b8097c
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-02-17 19:48:01 -10:00
Jack Andersen
48eaa2545b
Working CScriptGunTurret
2019-02-17 19:47:46 -10:00
Phillip Stephens
5209432b62
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde
2019-02-16 09:17:28 -08:00
Phillip Stephens
fb1f65434d
Fix IA8 texture decoding
2019-02-16 09:16:34 -08:00
Jack Andersen
6441bcc3a2
GCC build fix
2019-02-15 15:32:05 -10:00
Phillip Stephens
c1c22eb065
Fix IA4 encoding/decoding
2019-02-11 17:58:12 -08:00
Jack Andersen
01af7b735d
Implement CScriptSpindleCamera
2019-02-09 18:41:35 -10:00
Jack Andersen
88591f48f0
More bug fixes
2019-02-07 21:56:54 -10:00
Jack Andersen
5f8b65e3b5
Various bug fixes
2019-02-07 15:08:15 -10:00
Jack Andersen
5600bf5172
MSVC static library split hack
2019-02-06 18:10:07 -10:00
Phillip Stephens
825acbaa0d
Rename `warpto` command to simply `warp` to match command line argument
2019-02-06 17:55:28 -08:00
Phillip Stephens
6ead37804b
Add ability to remove items (WIP)
2019-02-06 17:26:53 -08:00
Jack Andersen
d0e34e0ac3
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-02-03 14:02:01 -10:00
Jack Andersen
a353c7ddcf
Metal shader fixes
2019-02-03 14:01:44 -10:00
Phillip Stephens
157946810a
Minor fixes to CFrontEndUI, add elapsed seconds to save selection
2019-02-03 13:20:05 -08:00
Phillip Stephens
0bb51f067c
Various fixes and minor code cleanup, issue warning when attempting to load an unimplemented object
2019-01-31 12:44:05 -08:00
Jack Andersen
7d29c6e25a
More bug fixes
2019-01-30 21:52:21 -10:00
Jack Andersen
c3d8afa852
Pathfinding and generator fixes
2019-01-29 22:38:16 -10:00
Jack Andersen
c8765bc1b9
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-01-29 10:14:49 -10:00
Jack Andersen
89906be162
Consistent lighting clamping
2019-01-29 10:14:34 -10:00
Jack Andersen
ad2681f857
Windows fixes
2019-01-28 22:28:35 -10:00
Phillip Stephens
4dd40f519e
Fix CScriptGenerator infinite recursion, update submodules
2019-01-26 15:22:51 -08:00
Jack Andersen
cf9062bba5
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-01-22 21:52:38 -10:00
Jack Andersen
137968ecc7
Bug fixes and CAutoMapper mouse events
2019-01-22 21:52:19 -10:00
Phillip Stephens
d5f3f370c8
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde
2019-01-22 22:00:59 -08:00
Phillip Stephens
049f51382b
Initial CAtomicBeta imps, needs variable names
2019-01-22 21:59:53 -08:00
Jack Andersen
aeb6a9a147
More mouse events for pause screen
2019-01-21 18:23:51 -10:00
Jack Andersen
1b019b734b
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2019-01-20 18:10:56 -10:00
Jack Andersen
f3f9924309
Initial mouse events for pause screen
2019-01-20 18:10:34 -10:00
Phillip Stephens
05e5fb9774
More CBabygoth Imps
2019-01-20 14:28:25 -08:00
Jack Andersen
47c6b5cba8
Bug fixes and CGuiFrame mouse events
2019-01-19 20:43:11 -10:00
Jack Andersen
851e113dc0
Implement CWarWasp
2019-01-15 18:22:44 -10:00
Jack Andersen
f9b0614327
Various bug fixes
2019-01-04 22:34:09 -10:00
Jack Andersen
d60fcc99c9
Fix CNewIntroBoss and particle bugs
2019-01-04 17:28:02 -10:00
Jack Andersen
5b55320e9b
Implement CPlasmaProjectile
2019-01-02 17:47:28 -10:00
Phillip Stephens
4f3c8daf27
Initial CBabygoth imps
2018-12-31 00:37:52 -08:00
Jack Andersen
147a9396c4
CBeetle implementation
2018-12-30 19:01:42 -10:00
Jack Andersen
0ec81477cf
CRagDoll fixes
2018-12-26 20:26:34 -10:00
Phillip Stephens
d657a8ecf6
Implement CAtomicAlpha
2018-12-17 20:42:17 -08:00
Phillip Stephens
6fe99a7ddf
Finish CFlickerBat imps
2018-12-16 21:40:27 -08:00
Jack Andersen
b7f35e0528
CRelAngle fix
2018-12-16 17:52:51 -10:00
Phillip Stephens
62d68a98da
Fix crash while taking damage in morphball
2018-12-16 13:10:18 -08:00
Jack Andersen
f184291461
ANCS PAS I/O fix
2018-12-15 20:32:07 -10:00
Jack Andersen
dac8fc3eb5
Space pirate bug fixes
2018-12-14 20:29:41 -10:00
Jack Andersen
ccf87925b9
Merge fixes
2018-12-12 21:47:50 -10:00
Jack Andersen
001d4ab7dc
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-12-12 21:40:55 -10:00
Jack Andersen
ec1cb75b25
Finish CSpacePirate implementation
2018-12-12 21:39:16 -10:00
Phillip Stephens
d30ceb6611
More CPuddleSpore implementations
2018-12-12 11:50:37 -08:00
Phillip Stephens
11c3c557bd
Initiial CPuddleSpore imp
2018-12-10 20:17:02 -08:00
Phillip Stephens
c7573ae52f
Finalize CFireFlea
2018-12-09 21:12:55 -08:00
Jack Andersen
14747e39e1
Windows fixes
2018-12-07 20:46:17 -10:00
Jack Andersen
636c82a568
New code style refactor
2018-12-07 19:30:43 -10:00
Jack Andersen
41ae32be31
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-12-07 18:36:12 -10:00
Jack Andersen
7c7da6671a
SIMD refactor
2018-12-07 15:49:15 -10:00
Phillip Stephens
dd705a3db9
Implement CSeedling
2018-12-05 16:46:35 -08:00
Phillip Stephens
eafe1d54a6
Fix samus not taking damage from CSpankWeed
2018-12-03 18:48:40 -08:00
Phillip Stephens
0ec9f1f4eb
Finish CSpankWeed
2018-12-03 18:31:15 -08:00
Phillip Stephens
9b2fd002c6
Implement CEyeBall, disable CPuddleToadGamma (preventing softlocks), initial CSpankWeed
2018-12-01 18:32:26 -08:00
Phillip Stephens
9948532957
Initial CPuddleToadGamma imps
2018-11-30 16:44:33 -08:00
Jack Andersen
e1fa938127
Work on CSpacePirate
2018-11-25 16:15:44 -10:00
Jack Andersen
9c88971df6
Initial CSpacePirate and rag doll imps
2018-11-23 22:09:35 -10:00
Jack Andersen
e736d8fa83
Fix CAnimSource reader POI handling
2018-11-20 14:51:15 -10:00
Phillip Stephens
925464dd56
Initial CEyeBall imps
2018-11-20 16:02:20 -08:00
Jack Andersen
eeb54df8d7
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-11-18 19:04:46 -10:00
Jack Andersen
fbe144bbbd
Working CParasite
2018-11-18 19:04:33 -10:00
Phillip Stephens
96f20512bb
More CScriptSpecialFunction imps, fix intermittent crash in CAnimTreeTweenBase
2018-11-18 21:01:39 -08:00
Jack Andersen
22da3a0f89
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-11-18 15:19:58 -10:00
Jack Andersen
35a3923cdf
Various bug fixes
2018-11-18 15:19:44 -10:00
Phillip Stephens
b2b0a6aee0
CMetaree imps
2018-11-17 21:10:06 -08:00
Jack Andersen
57c1196599
Various bug fixes
2018-11-17 18:01:29 -10:00
Jack Andersen
b099be63dd
Bug fixes
2018-11-17 14:10:26 -10:00
Phillip Stephens
28d695eea4
Push missing CBoneTracking.hpp
2018-11-17 14:49:32 -08:00
Phillip Stephens
ea4848196a
Implement CNewIntroBoss
2018-11-16 21:05:57 -08:00
Jack Andersen
cc4a895818
Finish CSteeringBehaviors
2018-11-15 20:06:20 -10:00
Phillip Stephens
5c3cfb519c
Initial CFlickerbat imps
2018-11-14 15:00:08 -08:00
Phillip Stephens
e6082d17f5
Initial CSteeringBehaviors imps
2018-11-14 11:23:34 -08:00
Phillip Stephens
a7e81073ae
CDamageInfo fixes, initial CPuffer
2018-11-13 20:16:11 -08:00
Jack Andersen
660e7cd239
Work on CParasite
2018-11-12 23:20:11 -10:00
Jack Andersen
bf3636a16e
Lots of CParasite implementations
2018-11-11 18:21:36 -10:00
Jack Andersen
94333e4726
Finish CStateMachine
2018-11-10 20:24:24 -10:00
Jack Andersen
9512f6c98d
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-11-10 17:28:24 -10:00
Jack Andersen
d4bb7d64eb
All CPatterned functions implemented
2018-11-10 17:27:54 -10:00
Phillip Stephens
89ece2e9b2
Proper CRandom16 usage
...
More CScriptGunTurret imps
2018-11-09 18:48:06 -08:00
Jack Andersen
4c61119970
Fix CStateManager::GetIdListForScript
2018-11-07 15:08:11 -10:00
Jack Andersen
1aab0528f3
Various bug fixes
2018-11-07 14:53:38 -10:00
Jack Andersen
0b3a9e1865
Implement CPatterned::KnockBack
2018-11-05 20:16:12 -10:00
Jack Andersen
3ef7386978
Proper interleaved rendering of indirect-textured particle instances
2018-11-04 21:25:28 -10:00
Jack Andersen
d6051f8808
Implement CKnockBackController
2018-11-04 20:12:53 -10:00
Jack Andersen
4c306e7e40
Implement CHUDBillboardEffect, bug fixes
2018-11-03 15:08:44 -10:00
Jack Andersen
d140f35886
All CEnvFxManager effects working
2018-11-02 22:46:12 -10:00
Jack Andersen
97f18efd27
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-11-01 22:16:42 -10:00
Jack Andersen
98c7525176
Initially working CEnvFxManager
2018-11-01 22:16:16 -10:00
Phillip Stephens
134f5a68a2
Implement CScriptDebugCameraWaypoint loader
2018-10-30 15:21:29 -07:00
Jack Andersen
93e9e2f6f1
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-10-27 15:23:27 -10:00
Jack Andersen
3147b49b3d
EVNT extraction fix
2018-10-27 15:22:55 -10:00
Phillip Stephens
dd30f51761
Initial CScriptGun implementation, more loaders
2018-10-27 17:20:30 -07:00
Jack Andersen
427f5d8786
Various bug fixes
2018-10-26 20:16:12 -10:00
Jack Andersen
29dad50cca
Particle, map and line renderer fixes
2018-10-25 18:37:22 -10:00
Jack Andersen
a2da358fd3
More D3D fixes
2018-10-22 15:31:00 -10:00
Jack Andersen
b76ee77ecf
Fix CMoviePlayer from rendering upside down on Vulkan
2018-10-20 19:39:16 -10:00
Jack Andersen
8fb77eac2c
Various bug fixes
2018-10-20 18:14:00 -10:00
Jack Andersen
395e5c191b
macOS build fixes
2018-10-18 16:44:41 -10:00
Jack Andersen
27ca93178a
Upside-down OpenGL reflection fix
2018-10-18 13:55:59 -10:00
Jack Andersen
290c79b57e
Fix AABB-point collision issue
2018-10-18 09:44:43 -10:00
Jack Andersen
93ff138ba9
16-bit fog volume LUT; fog is now 256x sexier
2018-10-17 22:28:57 -10:00
Jack Andersen
f433821320
Implement --warp command-line arguments
2018-10-17 18:51:59 -10:00
Jack Andersen
8d839d8a17
Scan visor and waterbox fix
2018-10-16 17:26:55 -10:00
Jack Andersen
b139e1c000
Fix space jump
2018-10-16 15:49:58 -10:00
Jack Andersen
3f4aeffb17
Merge branch 'shader-refactor'
2018-10-15 17:17:37 -10:00
Jack Andersen
919140c06f
macOS API sync
2018-10-15 17:17:02 -10:00
Jack Andersen
1851308021
Windows fixes
2018-10-14 10:16:21 -10:00
Phillip Stephens
bbfe61efbf
Various loader implementations
2018-10-11 15:57:05 -07:00
Jack Andersen
1559163f98
Shader refactor bug fixes and attachment model extract/cook
2018-10-11 10:50:05 -10:00
Jack Andersen
c91e5df986
Convert to pragma once
2018-10-06 17:42:33 -10:00
Jack Andersen
9461e98512
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde into shader-refactor
2018-10-06 16:59:32 -10:00
Jack Andersen
c307e354ca
Huge shader refactor
2018-10-06 16:59:17 -10:00
Phillip Stephens
8b25548482
Various bug fixes, implement `CMain::WarpTo`
2018-09-20 20:41:57 -07:00
Phillip Stephens
94fd52d0ea
HUD and CPlayer bug fixes
2018-09-20 11:17:09 -07:00
Phillip Stephens
02d54fd5ca
Initial CParasite implementation
2018-09-16 16:22:35 -07:00
Phillip Stephens
ac33e46590
Remove debug function call
2018-09-13 17:50:16 -07:00
Phillip Stephens
679ce01a61
More CPatterned imps
2018-09-13 17:49:34 -07:00
Phillip Stephens
c3d8967605
Implement CPowerBomb
2018-09-09 18:04:57 -07:00
Phillip Stephens
489470feda
Implement CBomb
2018-09-08 18:13:56 -07:00
Phillip Stephens
ee97ede3fe
Initial CPatterned imps
2018-09-07 16:51:07 -07:00
Phillip Stephens
95fbcf914c
Finish CAi imps
2018-09-06 22:24:55 -07:00
Phillip Stephens
1a372d2589
Add support for InvDstMultiply blending for shadows, initial CAi implementation
2018-09-06 20:37:39 -07:00
Jack Andersen
e46ec80b64
Integrate Amuse into hecl cook/extract for MP1/2
2018-09-02 14:46:16 -10:00
Jack Andersen
5a60a0acfc
Amuse API changes
2018-08-27 19:44:16 -10:00
Jack Andersen
273796b284
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-07-09 08:09:00 -10:00
Jack Andersen
67197621a1
Fix fixed position camera hint
2018-07-09 08:08:44 -10:00
Phillip Stephens
56a48cd624
Initial DNAMP3 fixes various missing loader imps
2018-07-08 16:03:35 -07:00
Jack Andersen
ef1f9d564c
Big Door initial animation fix
2018-06-29 15:35:43 -10:00
Jack Andersen
d0af2cb4f7
Finish CScriptPlatform
2018-06-29 10:21:36 -10:00
Jack Andersen
3a9e7b2f9b
PVS and DCLN bug fixes
2018-06-27 20:47:34 -10:00
Jack Andersen
680cb7b353
Finish CInterpolationCamera
2018-06-27 15:17:01 -10:00
Phillip Stephens
8df333b29a
Initial CInterpolationCamera Imps
2018-06-25 23:58:43 -07:00
Jack Andersen
f8b8211b0f
Name PathCamera property fields
2018-06-25 19:42:16 -10:00
Jack Andersen
68504f5c3a
Work on CPathCamera
2018-06-25 19:24:31 -10:00
Phillip Stephens
21b25f72a3
Initial CPathCamera imps
2018-06-24 18:02:29 -07:00
Jack Andersen
186acae5d8
Initial CScriptPlatform collision
2018-06-23 16:39:53 -10:00
Jack Andersen
4ddec7e10c
Make CLineRenderer supply verts in clip-space
2018-06-23 15:01:29 -10:00
Jack Andersen
19ffd74468
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-06-23 13:09:41 -10:00
Jack Andersen
cfe384b5c2
Better octree generation density
2018-06-23 13:09:16 -10:00
Phillip Stephens
e116d887c7
Implement CSnakeWeedSwarm loader
2018-06-23 16:08:16 -07:00
Jack Andersen
bc9d225c89
Fix boost ball and other collision issues
2018-06-21 19:11:20 -10:00
Jack Andersen
f4b01e9c3f
Fix AMD crash with instanced particle shaders
2018-06-21 17:08:47 -10:00
Jack Andersen
4a19b160b9
Follow 30-degree rule when exiting morph ball
2018-06-21 14:45:29 -10:00
Jack Andersen
718d2cb29e
Water rendering order fix, morphball visor fixes
2018-06-21 11:04:16 -10:00
Jack Andersen
cd3bba2f0e
Working grapple beam
2018-06-20 14:57:57 -10:00
Jack Andersen
64dd7b1643
Update fixNES
2018-06-18 21:03:00 -10:00
Jack Andersen
58c00b6c9c
Update fixNES integration
2018-06-18 11:38:51 -10:00
Jack Andersen
56b1e562ce
Initial integration of updated fixNES
2018-06-16 10:09:12 -10:00
Jack Andersen
079c343557
ANIM cook fix; OBB generation crash fix
2018-06-15 16:26:58 -10:00
Jack Andersen
513d9c99cd
VisorParameters scan passthrough property
2018-06-15 10:37:00 -10:00
Phillip Stephens
de952f8e8b
Implement god mode, and CWeaponMgr
2018-06-13 12:36:11 -07:00
Phillip Stephens
4d8cf17078
Better handling for logging CVar
2018-06-12 20:20:49 -07:00
Jack Andersen
cfb01b80f0
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-06-12 16:32:22 -10:00
Jack Andersen
941c4d793c
Fix CScriptEffect translation set
2018-06-12 16:32:02 -10: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
Jack Andersen
00a4cbdac7
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-06-11 15:17:36 -10:00
Jack Andersen
1e36329ed4
Implement Metal fluid plane tessellation shader
2018-06-11 15:16:27 -10:00
Phillip Stephens
c0b8b89a9b
Various CScriptSpecialFunction implementation, more debugOverlay CVars
2018-06-08 14:00:18 -07:00
Jack Andersen
8f9d7da3ee
Implement tessellation shader for HLSL
2018-06-07 15:15:46 -10:00
Jack Andersen
1456026875
Fix GLSL switch statement
2018-06-06 18:51:23 -10:00
Jack Andersen
5fb95d69d3
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-06-06 18:44:11 -10:00
Jack Andersen
ac424ff9eb
Implement CFluidPlaneGPU for GPU-computed water ripples
2018-06-06 18:43:26 -10:00
Phillip Stephens
53f5265648
Sometimes I hate git
2018-06-04 12:30:04 -07:00
Phillip Stephens
cb2b9fa8bd
Initial CScriptGunTurret Implementation
2018-06-04 12:15:35 -07:00
Jack Andersen
e63102e180
Implement water rippling and fix CFluidPlane memory access errors
2018-06-03 15:56:21 -10:00
Jack Andersen
a5f25bf3f4
Fix water rendering
2018-06-02 20:11:39 -10:00
Jack Andersen
357a7efa9a
Various bug fixes
2018-06-01 20:06:40 -10:00
Jack Andersen
56a5cfd115
Fix TSan-reported race conditions
2018-06-01 14:03:31 -10:00
Jack Andersen
7e45600bed
Major Vulkan performance improvement
2018-05-27 11:35:58 -10:00
Jack Andersen
cc6d79e280
Various bug fixes
2018-05-26 18:22:38 -10:00
Jack Andersen
92ed463051
synchronize macOS with latest changes
2018-05-26 11:30:19 -10:00
Jack Andersen
0d3a67e78f
Fix area token loading
2018-05-25 17:07:29 -10:00
Jack Andersen
98549a7785
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-24 20:40:18 -10:00
Jack Andersen
70b3404b7c
Windows build fixes and warning avoidance
2018-05-24 20:39:38 -10:00
Phillip Stephens
48f41b6c73
Minor fixes to CMetroidAreaCollider and CHudThreatInterface
2018-05-24 18:23:27 -07:00
Jack Andersen
3ceaa82035
Fill in remaining door properties
2018-05-21 21:53:42 -10:00
Jack Andersen
1ada86cc03
Vulkan fixes
2018-05-21 21:51:08 -10:00
Phillip Stephens
e982497055
Fix bug where CGameArea::Validate/PostConstruct attempts to reuse old section buffers
2018-05-20 19:10:55 -07:00
Jack Andersen
536f943858
Vulkan backend fixes
2018-05-20 12:38:56 -10:00
Phillip Stephens
f4bd59bb2f
Disable CPatterned branches in CScriptActorKeyframe for now, update submodules
2018-05-20 08:38:44 -07:00
Jack Andersen
f6259cc8c6
Remove recursion depth check
2018-05-19 20:23:13 -10:00
Jack Andersen
13747ff61f
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-19 20:15:22 -10:00
Jack Andersen
f60af632b3
Big fixes and big memory leak refactor (linux only for now)
2018-05-19 20:14:57 -10:00
Phillip Stephens
259a2d431c
Initial CScriptSpecialFunction implementations
2018-05-19 22:01:17 -07:00
Phillip Stephens
d2c2af326d
Minor fixes to CScriptDoor
2018-05-19 14:14:37 -07:00
Jack Andersen
5f03362149
More bug fixes
2018-05-18 19:16:08 -10:00
Jack Andersen
979a54a8a8
More bug fixes
2018-05-17 18:16:33 -10:00
Jack Andersen
055c8e8a47
Various fixes
2018-05-16 18:55:33 -10:00
Jack Andersen
e943a60694
CScriptColorModulate fixes
2018-05-16 14:04:07 -10:00
Jack Andersen
c6d7950896
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-15 18:08:09 -10:00
Jack Andersen
0987866896
Implement CScriptDebris; EVNT POI fixes
2018-05-15 18:07:38 -10:00
Phillip Stephens
9929dfbc6a
Fix logic derp in Think
2018-05-14 19:59:52 -07:00
Jack Andersen
10d36ac1d6
Fix actor physics move
2018-05-14 16:56:05 -10:00
Phillip Stephens
0c49c8ea9e
Implement CScriptActorKeyframe
2018-05-14 14:44:09 -07:00
Jack Andersen
e7c3942754
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-13 18:39:35 -10:00
Jack Andersen
317aa9af25
Finish CScriptPlayerActor
2018-05-13 18:38:58 -10:00
Phillip Stephens
8d395d932e
Implement CScriptEffect, more fixes for CScritDock
2018-05-13 20:38:36 -07:00
Jack Andersen
9130b9459a
More particle bug fixes
2018-05-13 13:27:47 -10:00
Jack Andersen
faf0ac7d27
Particle POI fix, implement ORNT mode for particles
2018-05-12 18:09:11 -10:00
Jack Andersen
41034fefda
Fix see though collision material
2018-05-10 21:02:42 -10:00
Jack Andersen
280ae47b15
Add dedicated Binaries directory for build targets
2018-05-10 12:00:03 -10:00
Jack Andersen
3911a2873d
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-09 21:25:40 -10:00
Jack Andersen
12430610f1
Lots of bug fixes
2018-05-09 21:25:26 -10:00
Phillip Stephens
fdf55e7272
Implement CScriptHUDMemo, increase render bucket size, initial debug overlay
2018-05-09 19:56:54 -07:00
Jack Andersen
b58ebc1af5
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-07 19:10:39 -10:00
Jack Andersen
1c977e8021
Scan visor fixes
2018-05-07 19:10:24 -10:00
Phillip Stephens
3bc1fc1160
Various area streaming fixes, implement missing object loaders
2018-05-07 19:19:09 -07:00
Jack Andersen
81d2276458
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-05-07 16:12:39 -10:00
Jack Andersen
70e791babc
Missing SCAN packaging fix
2018-05-07 16:11:07 -10:00
Phillip Stephens
ff59786c74
Add missing files
2018-05-06 17:52:35 -07:00
Phillip Stephens
f5ea144b47
Various level streaming fixes, remove support for uncooked rep
2018-05-06 17:47:40 -07:00
Jack Andersen
9d25d44fe8
CGuiFrame destructor fix
2018-05-06 13:47:55 -10:00
Phillip Stephens
734b25cad3
Fix doors and various area streaming bugs
2018-05-01 17:43:31 -07:00
Phillip Stephens
711c3e0d2c
Remove rstl::optional_object, various cleanups, implement CExplosion and CScriptDoor
2018-04-29 20:12:41 -07:00
Phillip Stephens
6d60ccfd04
Various fixes and tweaks, Implement CExplosion, Add cheats
2018-04-26 14:12:20 -07:00
Jack Andersen
4a490e7d43
Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde
2018-04-07 10:56:54 -10:00
Jack Andersen
ed4d7445c7
More fixes for GameCube cooking
2018-04-07 10:55:57 -10:00
Phillip Stephens
531b34b62d
Revert std::ceil on completion rate calculation
2018-04-06 17:22:08 -07:00
Jack Andersen
898114d803
PART MBSP property yaml fix
2018-04-04 20:58:11 -10:00
Jack Andersen
d5e471bac3
Several GameCube cooking fixes
2018-04-03 22:31:29 -10:00
Jack Andersen
06d755cf4c
GameCube spec cook fixes
2018-04-01 18:27:24 -10:00
Jack Andersen
7a2fbfc582
Initial work on GameCube package targeting
2018-03-27 22:09:41 -10:00
Jack Andersen
7c0bf75f7a
Various windows fixes and additions
2018-03-23 11:56:17 -10:00
Jack Andersen
7100ed437f
macOS decal rendering support
2018-03-16 17:41:01 -10:00
Jack Andersen
08569104c2
Projectile collision fix
2018-03-14 14:27:45 -10:00
Jack Andersen
017185109f
Fix disappearing actor issue
2018-03-04 13:23:21 -10:00
Jack Andersen
055de86170
ANIM serialization fix
2018-03-03 20:15:40 -10:00
Jack Andersen
48c285be11
FONT serialization fix; implement CPathFindSpline functions
2018-03-03 18:25:57 -10:00
Jack Andersen
d8eb8abc48
Attempted Windows build fix
2018-03-02 21:53:50 -10:00
Jack Andersen
cb2988c9a4
Finish pathfinding implementations
2018-03-02 19:49:13 -10:00
Jack Andersen
2018ef17d2
Work on pathfinding
2018-02-28 20:17:16 -10:00
Phillip Stephens
0c95ee6665
Update submodules, fix Linux build
2018-02-27 17:46:14 -08:00
Jack Andersen
e4ff23c279
Massive template-based DNA refactor
2018-02-21 21:24:51 -10:00
Jack Andersen
b405f33ded
Correct rstl::prereserved_vector implementation
2018-02-14 18:37:21 -10:00
Jack Andersen
98518e7d44
Implement CPFArea constructor
2018-02-13 21:51:18 -10:00
Jack Andersen
74ce62726d
Working space warp effect for charge beam
2018-02-12 20:46:59 -10:00
Jack Andersen
e263345b0a
Fix ShotSmoke effect
2018-02-12 12:27:40 -10:00
Jack Andersen
46a4a37cc6
Initial working projectiles
2018-02-11 19:30:21 -10:00
Jack Andersen
547471c6ba
Work on projectiles
2018-02-10 19:27:00 -10:00
Jack Andersen
4423250f36
Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
2018-02-09 20:26:49 -10:00
Jack Andersen
3754962301
Finish CProjectileWeapon
2018-02-09 20:26:12 -10:00
Phillip Stephens
d35cc2ce1d
Fix CScriptActorRotate
2018-02-09 17:23:18 -08:00
Jack Andersen
083571e693
Work on CGameProjectile
2018-02-08 21:12:26 -10:00
Jack Andersen
ae6797f24b
Fix player dynamic collision
2018-02-07 20:18:27 -10:00
Jack Andersen
8ab75b2c8f
Implement asynchonous memory card for Win32
2018-02-06 15:38:46 -10:00
Jack Andersen
13c0361021
Changes to support asynchronous kabufuda API
2018-02-06 12:02:31 -10:00
Jack Andersen
59af54afad
Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
2018-02-04 20:57:18 -10:00
Jack Andersen
ac8dfde174
Various bug fixes and CActor rendering
2018-02-04 20:56:09 -10:00
Jack Andersen
97835607d9
More windows build fixes
2018-02-03 20:46:47 -10:00
Jack Andersen
acf2dab66f
Fix NES memory card saves
2018-02-02 17:00:21 -10:00
Jack Andersen
15e5b4bbb8
NESEmulator save fixes
2018-02-02 14:35:19 -10:00
Jack Andersen
93fc2d8072
Initial fixNES integration
2018-02-01 13:19:34 -10:00
Jack Andersen
36f1473f3e
All animation nodes implemented
2018-01-29 15:04:01 -10:00
Jack Andersen
bb10423267
Various particle bug fixes
2018-01-26 22:34:46 -10:00
Jack Andersen
6f7cd14836
Ensure rumble pre-pulse
2018-01-26 09:46:35 -10:00
Jack Andersen
13a31be23b
Implement rumble classes
2018-01-25 23:48:42 -10:00
Jack Andersen
e949b3419e
Display Gamma integration
2018-01-21 12:05:25 -10:00
Jack Andersen
669b3d6942
CWorldShadow OpenGL fixes; discord-rpc integration
2018-01-15 20:42:28 -10:00
Phillip Stephens
030e80d843
Initial Console integration
2018-01-15 08:00:20 -08:00
Phillip Stephens
9255f0eeb0
Update hecl, various fixes
2018-01-15 04:36:04 -08:00
Jack Andersen
47b3d57c3a
Arm cannon rendering fixes
2018-01-14 21:39:25 -10:00
Jack Andersen
89b9a6d7d3
Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
2018-01-13 20:44:50 -10:00
Jack Andersen
7a179eb10a
Various bug fixes
2018-01-13 20:44:22 -10:00
Jack Andersen
3433bf2e34
Update submodules
2018-01-11 16:32:34 -10:00
Jack Andersen
e683fc223f
Metal non-MSAA fixes
2018-01-11 15:34:16 -10:00
Jack Andersen
92b640214a
Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
2018-01-07 09:55:41 -10:00
Jack Andersen
9bdb1cd1a5
Always keep scan visor graphics loaded
2018-01-07 09:55:09 -10:00
Phillip Stephens
c38c998a51
Build fixes
2018-01-07 01:29:01 -08:00
Jack Andersen
4e5c991424
Metal API adjustments; MSAA support
2018-01-06 19:19:49 -10:00
Jack Andersen
fd33d05fc0
Remove temporary debugging code
2018-01-05 20:52:44 -10:00
Jack Andersen
168fab6b14
HUD rendering bug fixes
2018-01-05 20:50:42 -10:00
Jack Andersen
a78c4c6b36
Animation transitions and pause screen fixes
2018-01-04 17:02:30 -10:00
Jack Andersen
99fc9e3598
Various bug fixes and CAnimTree implementations
2018-01-03 18:17:44 -10:00
Jack Andersen
fac324f08f
CHUDMemoParms fix
2018-01-01 00:18:06 -10:00
Jack Andersen
b5c79d0e75
Add .gitlab-ci.yml
2018-01-01 00:17:36 -10:00
Jack Andersen
aec45ad2bb
Windows PCH fixes
2017-12-29 15:09:45 -10:00
Jack Andersen
1f637b57ab
Missing file fix
2017-12-28 22:21:07 -10:00
Jack Andersen
8301adc3d6
Huge compile performance refactor
2017-12-28 22:08:12 -10:00
Jack Andersen
053ebd41c4
HUD bug fixes
2017-12-20 17:19:54 -10:00
Jack Andersen
c00cc6cea9
Lots of bug fixes; working CPhazonSuitFilter
2017-12-19 20:06:54 -10:00
Jack Andersen
1c44f8d1bc
Various movement and HUD bug fixes
2017-12-18 17:05:50 -10:00
Jack Andersen
73ae278c87
Several collision fixes
2017-12-17 16:54:50 -10:00
Jack Andersen
ce2ed8cec6
Camera and input fixes
2017-12-15 14:19:15 -10:00
Jack Andersen
ce6a3aa50c
Bug fixes and ASan build submodule
2017-12-11 16:06:19 -10:00
Jack Andersen
8901ac2150
Various fixes
2017-12-09 19:30:01 -10:00
Jack Andersen
5e03278eff
Add triangle flip bit for collision geometry
2017-12-08 19:17:51 -10:00
Jack Andersen
55cfb267c1
UWP fixes
2017-12-06 18:13:12 -10:00
Jack Andersen
1cb36fc37a
UWP support
2017-12-05 17:26:15 -10:00
Jack Andersen
ee5ca06830
Merge branch 'master' of ssh://gitlab.axiodl.com:6431/AxioDL/urde
2017-12-03 17:22:05 -10:00
Jack Andersen
397d3b690c
Use boo::ObjToken for referencing voices
2017-12-03 17:21:35 -10:00
Phillip Stephens
5c7a03fb40
Fix game crashing when touching a dock to an unloaded area
2017-12-03 18:26:17 -08:00
Jack Andersen
92767f5147
Fixes for new boo assert
2017-12-02 20:13:04 -10:00
Jack Andersen
357b001cac
Octree generation fixes
2017-12-01 19:50:05 -10:00
Jack Andersen
7cd3e8f502
Various bug fixes
2017-11-29 15:22:46 -10:00
Jack Andersen
7951cb1ee0
Bug fixes
2017-11-28 00:06:40 -10:00
Jack Andersen
31ccb48246
Buffer overrun bug fixes
2017-11-27 16:48:24 -10:00
Jack Andersen
f60097b7e3
Implement CScriptSound and bug fixes
2017-11-26 19:06:53 -10:00
Jack Andersen
11d17d0fe5
Various bug fixes
2017-11-25 17:04:25 -10:00
Jack Andersen
80f98e1218
Windows fixes
2017-11-24 16:50:24 -10:00
Jack Andersen
00b02bb0f3
Add lighting uniform to GLSL door plane shader
2017-11-24 12:08:16 -10:00
Jack Andersen
e5bd35746c
Merge branch 'master' of https://github.com/AxioDL/urde
2017-11-23 22:23:54 -10:00
Jack Andersen
6854cb9df7
Various bug fixes
2017-11-23 22:23:28 -10:00
Phillip Stephens
c6fdd8297e
Update boo, fixes and initial imps
2017-11-24 00:01:06 -08:00
Jack Andersen
41edf5a226
Initial CCinematicCamera implementations
2017-11-22 16:15:09 -10:00
Jack Andersen
ef4a07e963
Frustum culling fix
2017-11-21 12:18:52 -10:00
Jack Andersen
7a5dff47b7
Merge branch 'master' of https://github.com/AxioDL/urde
2017-11-21 00:36:45 -10:00
Jack Andersen
f579007dc1
Initial area rendering (needs frustum culling fixes)
2017-11-21 00:36:18 -10:00
Phillip Stephens
2ec2d07bdf
Fix CAutoMapper surfaces on Braswell
2017-11-20 09:33:21 -08:00
Phillip Stephens
f1b43c4805
Disable pause checks for the HUD
2017-11-19 18:07:00 -08:00
Jack Andersen
cff5198e6b
Major graphics resource performance improvement
2017-11-19 13:48:09 -10:00
Jack Andersen
3522d757fc
Add `-l` flag to enable logging
2017-11-18 21:10:54 -10:00
Jack Andersen
172a0049cc
Merge branch 'master' of https://github.com/AxioDL/urde
2017-11-18 10:00:18 -10:00
Jack Andersen
e00f6bfe30
HUD blending fixes and map interpolation
2017-11-18 09:59:49 -10:00
Phillip Stephens
d78a76febe
Fix default spawn handling
2017-11-18 01:19:56 -08:00
Jack Andersen
a2c79eb996
More CAutoMapper fixes
2017-11-17 17:35:37 -10:00